From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 93730 invoked by alias); 13 Feb 2018 13:03:11 -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 93714 invoked by uid 89); 13 Feb 2018 13:03:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.2 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=HX-Junkmail-Premium-Raw:sk:2018.2. X-HELO: rgout01.bt.lon5.cpcloud.co.uk Received: from rgout0105.bt.lon5.cpcloud.co.uk (HELO rgout01.bt.lon5.cpcloud.co.uk) (65.20.0.125) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 13 Feb 2018 13:03:10 +0000 X-OWM-Source-IP: 86.179.112.159 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2018.2.13.123616:17:7.944,ip=,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, __INVOICE_MULTILINGUAL, __FRAUD_MONEY_CURRENCY_DOLLAR, __LINES_OF_YELLING, __NO_HTML_TAG_RAW, BODY_SIZE_1900_1999, BODYTEXTP_SIZE_3000_LESS, __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 (86.179.112.159) by rgout01.bt.lon5.cpcloud.co.uk (9.0.019.21-1) (authenticated as jonturney@btinternet.com) id 5A5E18940B7A6400; Tue, 13 Feb 2018 13:03:07 +0000 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH cygport 1/2] Rename DEPEND to BUILD_REQUIRES Date: Tue, 13 Feb 2018 13:03:00 -0000 Message-Id: <20180213130241.42592-2-jon.turney@dronecode.org.uk> In-Reply-To: <20180213130241.42592-1-jon.turney@dronecode.org.uk> References: <0b30df64-9654-ec3e-ba85-860b9221181a@dronecode.org.uk> <20180213130241.42592-1-jon.turney@dronecode.org.uk> X-SW-Source: 2018-02/txt/msg00027.txt.bz2 Somewhat clearer as to it's purposes, and pluralized for consistency with REQUIRES. Still support the previous name for backwards compatibility v2: Do backwards compatibility correctly so it works when not doing 'all' --- bin/cygport.in | 7 +++++++ lib/check_funcs.cygpart | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/bin/cygport.in b/bin/cygport.in index c3370e1..e1c7ff4 100755 --- a/bin/cygport.in +++ b/bin/cygport.in @@ -428,6 +428,13 @@ then fi fi +if ! defined BUILD_REQUIRES +then + if defined DEPEND + then + BUILD_REQUIRES=${DEPEND} + fi +fi for restrict in ${RESTRICT//,/ } do diff --git a/lib/check_funcs.cygpart b/lib/check_funcs.cygpart index 961f263..fd232f4 100644 --- a/lib/check_funcs.cygpart +++ b/lib/check_funcs.cygpart @@ -543,9 +543,9 @@ check_vala_module() { return ${ret}; } -#****f* Information/DEPEND +#****f* Information/BUILD_REQUIRES # SYNOPSIS -# DEPEND="ATOM [ATOM] ..." +# BUILD_REQUIRES="ATOM [ATOM] ..." # DESCRIPTION # A list of build-time (not runtime) dependencies to be checked before calling # src_compile. Each ATOM can be in one of the following forms: @@ -565,6 +565,8 @@ check_vala_module() { # * tex(foo.ext): TeX modules # * vala(foo-1.0): Vala bindings # * foo: A Cygwin package (check skipped on non-Cygwin build systems) +# +# DEPEND is an obsolete synonym for BUILD_REQUIRES. #**** __check_depends() { local atom failed_atoms; @@ -574,14 +576,14 @@ __check_depends() { error "Compiling this package requires $(cross_compiling && echo -n ${CHOST}' ')binutils and gcc" fi - if ! defined DEPEND + if ! defined BUILD_REQUIRES then return 0; fi __deparenthesize() { echo "$@" | sed -e 's|[a-z]*(\([^)]*\))|\1|' ; } - for atom in ${DEPEND} + for atom in ${BUILD_REQUIRES} do case ${atom} in girepository\(*) -- 2.16.1