[PATCH cygport 1/2] Rename DEPEND to BUILD_DEPENDS

Jon Turney jon.turney@dronecode.org.uk
Tue Oct 3 19:53:00 GMT 2017


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



More information about the Cygwin-apps mailing list