public inbox for cygwin-apps@cygwin.com
 help / color / mirror / Atom feed
From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH cygport 1/2] Rename DEPEND to BUILD_DEPENDS
Date: Tue, 03 Oct 2017 19:53:00 -0000	[thread overview]
Message-ID: <20171003195323.82784-2-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20171003195323.82784-1-jon.turney@dronecode.org.uk>

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

  reply	other threads:[~2017-10-03 19:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-03 19:53 [PATCH cygport 0/2] Better handling of build depends Jon Turney
2017-10-03 19:53 ` Jon Turney [this message]
2017-10-03 20:17   ` [PATCH cygport 1/2] Rename DEPEND to BUILD_DEPENDS Andrew Schulman
2017-11-13 12:57   ` Jon Turney
2017-10-03 19:53 ` [PATCH cygport 2/2] Pass BUILD_DEPENDS through to .hint for source package as build-depends: Jon Turney
2018-02-13  6:31 ` [PATCH cygport 0/2] Better handling of build depends Yaakov Selkowitz
2018-02-13 12:34   ` Jon Turney
2018-02-13 13:03     ` [PATCH cygport 0/2] Better handling of build requires (v2) Jon Turney
2018-02-13 13:03       ` [PATCH cygport 2/2] Pass BUILD_REQUIRES through to .hint for source package as build-requires: Jon Turney
2018-02-13 13:03       ` [PATCH cygport 1/2] Rename DEPEND to BUILD_REQUIRES Jon Turney
2020-03-24  3:06 ` [PATCH cygport 0/2] Better handling of build depends Yaakov Selkowitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171003195323.82784-2-jon.turney@dronecode.org.uk \
    --to=jon.turney@dronecode.org.uk \
    --cc=cygwin-apps@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).