From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 77478 invoked by alias); 2 May 2017 13:14:16 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 77415 invoked by uid 89); 2 May 2017 13:14:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=REPLY, HX-Junkmail-Premium-Raw:sk:__SUBJ_ X-HELO: rgout06.bt.lon5.cpcloud.co.uk Received: from rgout0605.bt.lon5.cpcloud.co.uk (HELO rgout06.bt.lon5.cpcloud.co.uk) (65.20.0.132) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 02 May 2017 13:14:13 +0000 X-OWM-Source-IP: 31.51.207.210 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2017.5.2.130916:17:7.944,ip=,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __SUBJ_ALPHA_END, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, __FRAUD_MONEY_CURRENCY_DOLLAR, __NO_HTML_TAG_RAW, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_1200_1299, __MIME_TEXT_P1, __MIME_TEXT_ONLY, HTML_00_01, HTML_00_10, __FRAUD_MONEY_CURRENCY, BODY_SIZE_5000_LESS, IN_REP_TO, MSG_THREAD, __FROM_DOMAIN_IN_RCPT, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, NO_URI_FOUND, NO_CTA_URI_FOUND, BODY_SIZE_2000_LESS, __MIME_TEXT_P, REFERENCES, NO_URI_HTTPS, BODY_SIZE_7000_LESS Received: from localhost.localdomain (31.51.207.210) by rgout06.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 58F7952B016A8064; Tue, 2 May 2017 14:14:11 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH cygport 2/3] Don't allow SRC_URI or PATCH_URI to depend on ARCH Date: Tue, 02 May 2017 13:14:00 -0000 Message-Id: <20170502131345.158584-3-jon.turney@dronecode.org.uk> In-Reply-To: <20170502131345.158584-1-jon.turney@dronecode.org.uk> References: <20170502131345.158584-1-jon.turney@dronecode.org.uk> X-SW-Source: 2017-05/txt/msg00012.txt.bz2 The values which SRC_URI and PATCH_URI evaluate to should not change depending on ARCH, as this will make the source package arch-dependent --- bin/cygport.in | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/bin/cygport.in b/bin/cygport.in index 6cf0122..25d7e94 100644 --- a/bin/cygport.in +++ b/bin/cygport.in @@ -409,6 +409,32 @@ then error "${cygportfile} not found."; fi +### perform some validation on the .cygport + +# SRC_URI and PATCH_URI should not change depending on ARCH, as this will make +# the source package arch-dependent +declare -i n +declare -a VALUE +ARCHES=("i686" "x86_64" "noarch") +for VAR in "SRC_URI" "PATCH_URI" +do + n=0 + while (( n < ${#ARCHES[*]} )) + do + read -r < <(declare ARCH=${ARCHES[$n]}; declare ARCH_${ARCH}=1; source ${top}/${cygportfile}; eval echo "\$${VAR}") + VALUE[$n]=${REPLY} + if (( n > 0 )) + then + if [ "x${VALUE[0]}" != "x${VALUE[$n]}" ] + then + error "${VAR} appears to depend on ARCH" + fi + fi + n+=1; + done +done +unset n VALUE ARCHES VAR + ### load .cygport source ${top}/${cygportfile} || error "could not read ${cygportfile}" ### -- 2.12.2