X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/4fd853fc3e159765692f8c2c8a037c1ad1ed7f81..9a653b4634befb4b6cf76db5e69cbcf2cbe0f440:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 270fc403..c1aea3cc 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -43,7 +43,7 @@ if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}e
 : ${TERMUX_GCC_VERSION:="4.9"}
 : ${TERMUX_API_LEVEL:="21"}
 : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc${TERMUX_GCC_VERSION}"}
-: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.0"}
+: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.2"}
 # 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.
@@ -354,7 +354,8 @@ termux_step_configure () {
 	local AVOID_AUTOCONF_WRAPPERS="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
 	# Similarly, disable gnulib's rpl_getcwd(). It returns the wrong value, affecting zile. See
 	# <https://github.com/termux/termux-packages/issues/76>.
-	local AVOID_AUTOCONF_WRAPPERS="gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_posix_signature=yes gl_cv_func_getcwd_path_max=yes gl_cv_func_getcwd_abort_bug=no $AVOID_AUTOCONF_WRAPPERS"
+	AVOID_AUTOCONF_WRAPPERS+=" gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_posix_signature=yes gl_cv_func_getcwd_path_max=yes gl_cv_func_getcwd_abort_bug=no"
+	AVOID_AUTOCONF_WRAPPERS+=" gl_cv_header_working_fcntl_h=yes gl_cv_func_fcntl_f_dupfd_cloexec=yes gl_cv_func_fcntl_f_dupfd_works=yes"
 
 	env $AVOID_AUTOCONF_WRAPPERS $TERMUX_PKG_SRCDIR/configure \
 		--disable-dependency-tracking \
@@ -544,6 +545,24 @@ termux_step_create_debscripts () {
 }
 
 termux_setup_golang () {
+	export GOOS=android
+	export CGO_ENABLED=1
+	export GO_LDFLAGS="-extldflags=-pie"
+	if [ "$TERMUX_ARCH" = "arm" ]; then
+		export GOARCH=arm
+		export GOARM=7
+	elif [ "$TERMUX_ARCH" = "i686" ]; then
+		export GOARCH=386
+		export GO386=sse2
+	elif [ "$TERMUX_ARCH" = "aarch64" ]; then
+		export GOARCH=arm64
+	elif [ "$TERMUX_ARCH" = "x86_64" ]; then
+		export GOARCH=amd64
+	else
+		echo "ERROR: Unsupported arch: $TERMUX_ARCH"
+		exit 1
+	fi
+
 	local TERMUX_GO_VERSION=go1.6beta1
 	local TERMUX_GO_PLATFORM=linux-amd64
 	test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64