From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 47712 invoked by alias); 3 Oct 2017 19:53:45 -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 47651 invoked by uid 89); 3 Oct 2017 19:53:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 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=Compiling X-HELO: rgout0802.bt.lon5.cpcloud.co.uk Received: from rgout0802.bt.lon5.cpcloud.co.uk (HELO rgout0802.bt.lon5.cpcloud.co.uk) (65.20.0.149) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Oct 2017 19:53:43 +0000 X-OWM-Source-IP: 86.151.121.210 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2017.10.3.192716: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, __FRAUD_MONEY_CURRENCY_DOLLAR, __LINES_OF_YELLING, __NO_HTML_TAG_RAW, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_1600_1699, __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.151.121.210) by rgout08.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 58BFF08015CDCDB1; Tue, 3 Oct 2017 20:53:41 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH cygport 1/2] Rename DEPEND to BUILD_DEPENDS Date: Tue, 03 Oct 2017 19:53:00 -0000 Message-Id: <20171003195323.82784-2-jon.turney@dronecode.org.uk> In-Reply-To: <20171003195323.82784-1-jon.turney@dronecode.org.uk> References: <20171003195323.82784-1-jon.turney@dronecode.org.uk> X-SW-Source: 2017-10/txt/msg00020.txt.bz2 Somewhat clearer as to it's purposes, and pluralized for consistency with REQUIRES. Still support the previous name for backwards compatibility --- lib/check_funcs.cygpart | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/check_funcs.cygpart b/lib/check_funcs.cygpart index 93f3e12..08b1be3 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_DEPENDS # SYNOPSIS -# DEPEND="ATOM [ATOM] ..." +# BUILD_DEPENDS="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_DEPENDS. #**** __check_depends() { local atom failed_atoms; @@ -574,14 +576,19 @@ __check_depends() { error "Compiling this package requires $(cross_compiling && echo -n ${CHOST}' ')binutils and gcc" fi - if ! defined DEPEND + if ! defined BUILD_DEPENDS then - return 0; + if defined DEPEND + then + BUILD_DEPENDS=${DEPEND} + else + return 0; + fi fi __deparenthesize() { echo "$@" | sed -e 's|[a-z]*(\([^)]*\))|\1|' ; } - for atom in ${DEPEND} + for atom in ${BUILD_DEPENDS} do case ${atom} in girepository\(*) -- 2.14.2