From: Corinna Vinschen <corinna-cygwin@cygwin.com>
To: cygwin-apps@cygwin.com
Subject: [PATCH 1/2] Filter newlines from BUILD_REQUIRES
Date: Sat, 3 Dec 2022 17:14:06 +0100 [thread overview]
Message-ID: <20221203161407.2337644-1-corinna-cygwin@cygwin.com> (raw)
From: Corinna Vinschen <corinna@vinschen.de>
BUILD_REQUIRES is added verbatim to the build-depends: line in
the *-src.hint file. If the cygport file defines BUILD_REQUIRES
with spaces, e. g.
BUILD_REQUIRES="
a
b
"
The -src.hint file is broken. Avoid this by filtering out any
newline's from BUILD_REQUIRES before using it in the subsequent
expression building the -src.hint file.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
lib/pkg_pkg.cygpart | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index 82112e1cfc79..eb06a08dd562 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -544,6 +544,10 @@ __pkg_srcpkg() {
elif [ -n "${!pkg_category_var:-${CATEGORY}}" \
-a -n "${!pkg_summary_var:-${SUMMARY}}${!pkg_description_var:-${DESCRIPTION}}" ]
then
+ # BUILD_REQUIRES is added to the build-depends: line
+ # in the hint file written below. Convert LFs to
+ # spaces to make sure it's actually a single line.
+ BUILD_REQUIRES=$(echo -n "$BUILD_REQUIRES" | tr '\n' ' ')
cat > ${distdir}/${PN}/${PN}-${PVR}-src.hint <<-_EOF
category: ${!pkg_category_var:-${CATEGORY}}
build-depends: cygport ${BUILD_REQUIRES}
--
2.38.1
next reply other threads:[~2022-12-03 16:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-03 16:14 Corinna Vinschen [this message]
2022-12-03 16:14 ` [PATCH 2/2] Default to x86_64 build on non-Cygwin hosts Corinna Vinschen
2022-12-03 18:08 ` Jon Turney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221203161407.2337644-1-corinna-cygwin@cygwin.com \
--to=corinna-cygwin@cygwin.com \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).