This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH cygport 1/2] Rename DEPEND to BUILD_REQUIRES
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