golang: Update from 1.7.beta2 to 1.7 final release

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 0941f10..5a01fe8 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -51,12 +51,16 @@ else
 fi
 
 # Compute standalone toolchain dir, bitness of arch and name of host platform:
-TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/android-standalone-toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}-"
+TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}-"
 if [ "$TERMUX_CLANG" = "" ]; then
        TERMUX_STANDALONE_TOOLCHAIN+="gcc4.9"
 else
        TERMUX_STANDALONE_TOOLCHAIN+="clang38"
 fi
+# Bump the below version if a change is made in toolchain setup, to ensure
+# that everyone gets an updated toolchain:
+TERMUX_STANDALONE_TOOLCHAIN+="-v1"
+
 if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then
        TERMUX_ARCH_BITS=64
 else
@@ -107,7 +111,8 @@ export TERMUX_TOUCH="touch"
 test `uname` = "Darwin" && TERMUX_TOUCH=gtouch
 
 export prefix=${TERMUX_PREFIX} # prefix is used by some makefiles
-#export ACLOCAL="aclocal -I $TERMUX_PREFIX/share/aclocal"
+export PREFIX=${TERMUX_PREFIX} # PREFIX is used by some makefiles
+
 export AR=$TERMUX_HOST_PLATFORM-ar
 if [ "$TERMUX_CLANG" = "" ]; then
        export AS=${TERMUX_HOST_PLATFORM}-gcc
@@ -207,6 +212,27 @@ if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
        mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN
 fi
 
+if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ]; then
+       # Setup libgnustl_shared.so in $PREFIX/lib and libstdc++.so as a symlink to it,
+       # so that other C++ using packages links to it instead of the default android
+       # C++ library which does not support exceptions or STL:
+       # https://developer.android.com/ndk/guides/cpp-support.html
+       # We do however want to avoid installing this, to avoid problems # where e.g.
+       # libm.so on some i686 devices links against libstdc++.so.
+       # The libgnustl_shared.so library will be packaged in the libgnustl package
+       # which is part of the base Termux installation.
+       mkdir -p $TERMUX_PREFIX/lib
+       cd $TERMUX_PREFIX/lib
+        _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/libgnustl_shared.so
+       if [ $TERMUX_ARCH = arm ]; then
+               _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/libgnustl_shared.so
+       elif [ $TERMUX_ARCH = x86_64 ]; then
+               _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib64/libgnustl_shared.so
+       fi
+       cp $_STL_LIBFILE .
+       ln -f -s libgnustl_shared.so libstdc++.so
+fi
+
 export TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache"
 export TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs"
 mkdir -p $TERMUX_COMMON_CACHEDIR $TERMUX_DEBDIR
@@ -234,6 +260,7 @@ TERMUX_PKG_KEEP_STATIC_LIBRARIES="false"
 TERMUX_PKG_KEEP_HEADER_FILES="false"
 TERMUX_PKG_ESSENTIAL=""
 TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
+TERMUX_PKG_REPLACES=""
 TERMUX_PKG_CONFFILES=""
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE=""
 TERMUX_PKG_DEVPACKAGE_DEPENDS=""
@@ -528,23 +555,21 @@ termux_step_massage () {
        # .. move over sbin to bin
        for file in sbin/*; do if test -f $file; then mv $file bin/; fi; done
 
-       # file(1) may fail for certain unusual files, so disable pipefail
-       set +e +o pipefail
         # Remove world permissions and add write permissions:
         find . -exec chmod u+w,o-rwx \{\} \;
-       # .. strip binaries (setting them as writeable first)
        if [ "$TERMUX_DEBUG" = "" ]; then
-                find . -type f | xargs file | grep -E "(executable|shared object)" | grep ELF | cut -f 1 -d : | xargs $STRIP --strip-unneeded --preserve-dates -R '.gnu.version*'
+               # Strip binaries. file(1) may fail for certain unusual files, so disable pipefail.
+               set +e +o pipefail
+               find . -type f | xargs -r file | grep -E "(executable|shared object)" | grep ELF | cut -f 1 -d : | \
+                       xargs -r $STRIP --strip-unneeded --preserve-dates -R '.gnu.version*'
+               set -e -o pipefail
+               # Remove DT_ entries which the android 5.1 linker warns about:
+               find . -type f -print0 | xargs -r -0 $TERMUX_ELF_CLEANER
        fi
         # Fix shebang paths:
         for file in `find -L . -type f`; do
                 head -c 100 $file | grep -E "^#\!.*\\/bin\\/.*" | grep -q -E -v "^#\! ?\\/system" && sed --follow-symlinks -i -E "1 s@^#\!(.*)/bin/(.*)@#\!$TERMUX_PREFIX/bin/\2@" $file
         done
-       set -e -o pipefail
-        # Remove DT_ entries which the android 5.1 linker warns about:
-       if [ "$TERMUX_DEBUG" = "" ]; then
-               find . -type f -print0 | xargs -0 $TERMUX_ELF_CLEANER
-       fi
 
        test ! -z "$TERMUX_PKG_RM_AFTER_INSTALL" && rm -Rf $TERMUX_PKG_RM_AFTER_INSTALL
 
@@ -661,7 +686,7 @@ termux_setup_golang () {
                exit 1
        fi
 
-       local TERMUX_GO_VERSION=go1.6.2
+       local TERMUX_GO_VERSION=go1.7
        local TERMUX_GO_PLATFORM=linux-amd64
        test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 
@@ -811,6 +836,7 @@ HERE
 test ! -z "$TERMUX_PKG_DEPENDS" && echo "Depends: $TERMUX_PKG_DEPENDS" >> DEBIAN/control
 test ! -z "$TERMUX_PKG_ESSENTIAL" && echo "Essential: yes" >> DEBIAN/control
 test ! -z "$TERMUX_PKG_CONFLICTS" && echo "Conflicts: $TERMUX_PKG_CONFLICTS" >> DEBIAN/control
+test ! -z "$TERMUX_PKG_REPLACES" && echo "Replaces: $TERMUX_PKG_REPLACES" >> DEBIAN/control
 
 # Create DEBIAN/conffiles (see https://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html):
 for f in $TERMUX_PKG_CONFFILES; do echo $TERMUX_PREFIX/$f >> DEBIAN/conffiles; done