From: Corinna Vinschen <[email protected]>
BUILD_REQUIRES is added verbatim to the build-depends: line in
the *-src.hint file. If the cygport file defines BUILD_REQUIRES
with newlines, 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 <[email protected]>
---
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