cygport: calm can fail when BUILD_REQUIRES contains some newlines

Lemures Lemniscati lemures.lemniscati@gmail.com
Mon Aug 3 11:29:44 GMT 2020


Hi!

It may cause an issue when BUILD_REQUIRES contains some newlines in
a cygport file. 

Because cygport-0.34-1 generates *src.hint with raw BUILD_REQUIRES, and
extra newlines in 'build-depends' may be rejected by calm when uploading
packages.


This is a work-around patch by squeezing white spaces in BUILD_REQUIRES.

====

diff -ur a/cygport-0.34.0/lib/pkg_pkg.cygpart
b/cygport-0.34.0/lib/pkg_pkg.cygpart
--- a/cygport-0.34.0/lib/pkg_pkg.cygpart	2020-05-11 01:06:43.000000000 +0900
+++ b/cygport-0.34.0/lib/pkg_pkg.cygpart	2020-08-03 20:13:35.080509700 +0900
@@ -915,7 +915,7 @@
 		then
 			cat > ${distdir}/${PN}/${PN}-${PVR}-src.hint <<-_EOF
 category: ${!pkg_category_var:-${CATEGORY}}
-build-depends: cygport ${BUILD_REQUIRES}
+build-depends: $(printf "%s" "cygport ${BUILD_REQUIRES}" | sed -ze 's/[\t\n\f\r]/ /g;s/  */ /g;s/^ *//;s/ *$//')
 sdesc: "${!pkg_summary_var:-${SUMMARY}}"
 ldesc: "${!pkg_description_var:-${DESCRIPTION:-${!pkg_summary_var:-${SUMMARY}}}}"
 skip:


====

Regards, 

Lem


More information about the Cygwin mailing list