From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 7 Jan 2017 05:38:04 +0000 (-0500)
Subject: Fix build of python after build-package.sh rewrite
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/2b0e9dc9e252b0931beb32431d6c25ef8eb38cd3?hp=a3f2fff5858eb54979069d3cdb415a6481ae2a57

Fix build of python after build-package.sh rewrite
---

diff --git a/build-package.sh b/build-package.sh
index 1fc0ebdd..b9543c4d 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -170,6 +170,9 @@ termux_step_setup_variables() {
 		termux_error_exit "Wrong NDK version - we need $TERMUX_NDK_VERSION"
 	fi
 
+	# The build tuple that may be given to --build configure flag:
+	TERMUX_BUILD_TUPLE=$(sh "$TERMUX_SCRIPTDIR/scripts/config.guess")
+
 	# We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH
 	# to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
 	# the standalone toolchain.
@@ -551,7 +554,7 @@ termux_step_setup_toolchain() {
 	chmod +x "$PKG_CONFIG"
 }
 
-# This should not be overridden by packages.
+# Apply all *.patch files for the package. Not to be overridden by packages.
 termux_step_patch_package () {
 	cd "$TERMUX_PKG_SRCDIR"
 	# Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses:
@@ -563,8 +566,6 @@ termux_step_patch_package () {
 
 	find . -name config.sub -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.sub" '{}' \;
 	find . -name config.guess -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.guess" '{}' \;
-	# The host tuple that may be given to --host configure flag, but normally autodetected so not needed explicitly
-	TERMUX_HOST_TUPLE=$(sh "$TERMUX_SCRIPTDIR/scripts/config.guess")
 }
 
 # For package scripts to override. Called in $TERMUX_PKG_BUILDDIR.
diff --git a/packages/python/build.sh b/packages/python/build.sh
index 52943562..7fbc3fa4 100644
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -22,7 +22,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_ftime=no"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_faccessat=no"
 # The gethostbyname_r function does not exist on device libc:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_gethostbyname_r=no"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_HOST_TUPLE --with-system-ffi --without-ensurepip"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_BUILD_TUPLE --with-system-ffi --without-ensurepip"
 # Hard links does not work on Android 6:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_linkat=no"
 # Posix semaphores are not supported on Android:
diff --git a/packages/python2/build.sh b/packages/python2/build.sh
index 68ca0020..267f374a 100644
--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@@ -23,7 +23,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_faccessat=no"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_gethostbyname_r=no"
 # Do not assume getaddrinfo is buggy when cross compiling:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_buggy_getaddrinfo=no"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_HOST_TUPLE --with-system-ffi --without-ensurepip"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --build=$TERMUX_BUILD_TUPLE --with-system-ffi --without-ensurepip"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-unicode=ucs4"
 
 # Let 2to3 be in the python3 package: