From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by sourceware.org (Postfix) with ESMTPS id 5ABFA3858D20 for ; Sat, 3 Dec 2022 16:19:12 +0000 (GMT) Authentication-Results: sourceware.org; dmarc=permerror header.from=cygwin.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=cygwin.com Received: from calimero.vinschen.de ([24.134.7.25]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M6VRf-1p3Q6J1Q2z-006xbl for ; Sat, 03 Dec 2022 17:19:10 +0100 Received: by calimero.vinschen.de (Postfix, from userid 500) id 6953EA80891; Sat, 3 Dec 2022 17:19:09 +0100 (CET) From: Corinna Vinschen To: cygwin-apps@cygwin.com Subject: [PATCH 1/2 v2] Filter newlines from BUILD_REQUIRES Date: Sat, 3 Dec 2022 17:19:09 +0100 Message-Id: <20221203161909.2337873-1-corinna-cygwin@cygwin.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:Ws7tUmtRxa1dHqmv2IBryrcgOji+WJBZMKY+96Xh1CNPc0/keJK nSeFTa2bHjfYN+iKv2ZVzIyTX5Uen6N5PUG/gkhfJkUCPrZZbUmrGG0M4UZZq/DuSHD28ll 0M4XuSAVWDKpnZVdynKkBGy/y5YjuWGLOhO3ZIrzBWHI69jInV6tc1LyrK9H77obKJDOZJF kRG8PWsky2bsojzTPasTw== X-UI-Out-Filterresults: notjunk:1;V03:K0:nXkfz78L+Lg=:I35VIcYJ+N6Kbjb8NBc5Jo tyKuhestUX+pizT1yGRT6PvJVKcY60q2wHliJsgVOAUDAIMBR2aGSMvfAZzNTnCf8yckuuUnx Xu9+w3XDjw+5TwLmgOZLUTwf3sVbQB1QKeZpA9SCv4RJADRdDBO02cyHVd58zWdJklzoncBmw /OUc0WODhugnAlAgiD76k6+N43b8Zwg6zFPDN3kUdrouxDQ4ZydwV+bl4L2vwLQIaPu1Dy1iI jO25138Mj3xP4e2zp7ZLay1C2TTgxeJs1phNP3vs/Pasn8Riely3GhOjUiVCQXTVJnztFPbTZ Fp0GqFIWuPXn+ml7GeMHoVNi16sOspHX3ctHirZzldeJoraN5xFr8nfGUwaolTZZ5hb0rIA7C CGD0cghJNNdlf3dnGDK5Ke6/0mvYHkfp0AK2kvcEgO35NnXe+amzNJ9ccS5AeGQ5ciGPlR0mH JS0NmpObVGb4fBYb1K1g8z95AgQ7HzjfuMe/H1lMVrVsp7nlvIppuZtXo2a4c7/IPVnURXEDt BNin75nbnM5Zh2TabnHop2Jh/40rfUwco+91FkwTuXEHMj1T9atKPyvH2SLR5aj4A8aqRhbnT XgKBvZU6pezfb0101+jovjfbwKbGnLmKUR2+FLMCAu+ileDazjW+l+26KAOLDaCsPFxDzZ2aw a608PbvDjIK1A++JBePInB/hUu2M3lVQ6wXhTL3zGIJ9Ii2cs2ftfqpf+GYBwsl/OZ7xNBMB8 a1JrEbJZUKp3COkF9bFd5ZMjuvHj50FIjXx7XH0BX2eJ8XyNWTnbqZWYEvI0tmiz4k7IFN4Ra l0ZnCzTg9uVZdZaKbJLHwV9EWBU/g== X-Spam-Status: No, score=-101.5 required=5.0 tests=BAYES_00,GIT_PATCH_0,GOOD_FROM_CORINNA_CYGWIN,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Corinna Vinschen 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 --- 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