X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/d6fcd836c698855eb8d788fbb0f18011b2c64bff..ec40c73f60f2a412cd60b96e075f7d57d006921e:/build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 631ec52c..8c8e5fc9 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.
@@ -215,7 +215,7 @@ fi
 echo $TERMUX_ARCH > $TERMUX_ARCH_FILE
 
 # Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build)
-mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp}
+mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp,include}
 
 # Make $TERMUX_PREFIX/bin/sh executable on the builder, so that build script can assume that it works
 # on both builder and host later on:
@@ -499,7 +499,7 @@ termux_step_massage () {
 
                 cd $SUB_PKG_DIR/massage
                 SUB_PKG_INSTALLSIZE=`du -sk . | cut -f 1`
-		$TERMUX_TAR --xz -cf $SUB_PKG_PACKAGE_DIR/data.tar.xz .
+		$TERMUX_TAR -cJf $SUB_PKG_PACKAGE_DIR/data.tar.xz .
 
                 mkdir -p DEBIAN
 		cd DEBIAN
@@ -514,13 +514,13 @@ Homepage: $TERMUX_PKG_HOMEPAGE
 HERE
                 test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control
                 test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control
-		$TERMUX_TAR -czf $SUB_PKG_PACKAGE_DIR/control.tar.gz .
+		$TERMUX_TAR -cJf $SUB_PKG_PACKAGE_DIR/control.tar.xz .
 
                 # Create the actual .deb file:
                 TERMUX_SUBPKG_DEBFILE=$TERMUX_COMMON_DEBDIR/${SUB_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb
 		ar cr $TERMUX_SUBPKG_DEBFILE \
 				   $TERMUX_COMMON_CACHEDIR/debian-binary \
-				   $SUB_PKG_PACKAGE_DIR/control.tar.gz \
+				   $SUB_PKG_PACKAGE_DIR/control.tar.xz \
 				   $SUB_PKG_PACKAGE_DIR/data.tar.xz
                 if [ "$TERMUX_PROCESS_DEB" != "" ]; then
 			$TERMUX_PROCESS_DEB $TERMUX_SUBPKG_DEBFILE
@@ -545,7 +545,25 @@ termux_step_create_debscripts () {
 }
 
 termux_setup_golang () {
-	local TERMUX_GO_VERSION=go1.6beta1
+	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.6
 	local TERMUX_GO_PLATFORM=linux-amd64
 	test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 
@@ -663,7 +681,7 @@ if [ "`find . -type f`" = "" ]; then
         echo "ERROR: No files in package"
         exit 1
 fi
-$TERMUX_TAR --xz -cf $TERMUX_PKG_PACKAGEDIR/data.tar.xz .
+$TERMUX_TAR -cJf $TERMUX_PKG_PACKAGEDIR/data.tar.xz .
 
 # Get install size. This will be written as the "Installed-Size" deb field so is measured in 1024-byte blocks:
 TERMUX_PKG_INSTALLSIZE=`du -sk . | cut -f 1`
@@ -694,14 +712,14 @@ for f in $TERMUX_PKG_CONFFILES; do echo $TERMUX_PREFIX/$f >> DEBIAN/conffiles; d
 cd DEBIAN
 termux_step_create_debscripts
 
-# Create control.tar.gz
-$TERMUX_TAR -czf $TERMUX_PKG_PACKAGEDIR/control.tar.gz .
+# Create control.tar.xz
+$TERMUX_TAR -cJf $TERMUX_PKG_PACKAGEDIR/control.tar.xz .
 # In the .deb ar file there should be a file "debian-binary" with "2.0" as the content:
 TERMUX_PKG_DEBFILE=$TERMUX_COMMON_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb
 # Create the actual .deb file:
 ar cr $TERMUX_PKG_DEBFILE \
                    $TERMUX_COMMON_CACHEDIR/debian-binary \
-                   $TERMUX_PKG_PACKAGEDIR/control.tar.gz \
+                   $TERMUX_PKG_PACKAGEDIR/control.tar.xz \
                    $TERMUX_PKG_PACKAGEDIR/data.tar.xz
 
 if [ "$TERMUX_PROCESS_DEB" != "" ]; then