This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH cygport 1/2] Rename DEPEND to BUILD_DEPENDS
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: cygwin-apps at cygwin dot com
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Mon, 13 Nov 2017 12:57:26 +0000
- Subject: [PATCH cygport 1/2] Rename DEPEND to BUILD_DEPENDS
- Authentication-results: sourceware.org; auth=none
- References: <20171003195323.82784-2-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
v2:
Do backwards compatibility correctly so it works when not doing 'all'
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
---
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 31b909d..600d982 100644
--- a/bin/cygport.in
+++ b/bin/cygport.in
@@ -426,6 +426,13 @@ then
fi
fi
+if ! defined BUILD_DEPENDS
+then
+ if defined DEPEND
+ then
+ BUILD_DEPENDS=${DEPEND}
+ fi
+fi
for restrict in ${RESTRICT//,/ }
do
diff --git a/lib/check_funcs.cygpart b/lib/check_funcs.cygpart
index 93f3e12..eea19e9 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,14 @@ __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;
fi
__deparenthesize() { echo "$@" | sed -e 's|[a-z]*(\([^)]*\))|\1|' ; }
- for atom in ${DEPEND}
+ for atom in ${BUILD_DEPENDS}
do
case ${atom} in
girepository\(*)
--
2.15.0