emacs: Update from 25.0.95 to 25.1
[termux-packages] / build-package.sh
index a19b8bb..dd72ed7 100755 (executable)
@@ -2,68 +2,46 @@
 
 set -e -o pipefail -u
 
-if [ "$#" -ne 1 ]; then echo "ERROR: Specify one argument (name of or path to package)"; exit 1; fi
-export TERMUX_PKG_NAME=`basename $1`
-export TERMUX_SCRIPTDIR=`cd $(dirname $0); pwd`
-
-if [[ $1 == *"/"* ]]; then
-  # Path to directory which may be outside this repo:
-  if [ ! -d $1 ]; then echo "ERROR: '$1' seems to be a path but is not a directory"; exit 1; fi
-  export TERMUX_PKG_BUILDER_DIR=`realpath $1`
-else
-  # Package name:
-  export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME
-fi
-export TERMUX_PKG_BUILDER_SCRIPT=$TERMUX_PKG_BUILDER_DIR/build.sh
-if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then echo "ERROR: No build.sh script at supposed package dir $TERMUX_PKG_BUILDER_DIR!"; exit 1; fi
-
-echo "termux - building $1..."
-test -t 1 && printf "\033]0;$1...\007"
-
-# Read settings from .termuxrc if existing
+# Read settings from .termuxrc if existing:
 test -f $HOME/.termuxrc && . $HOME/.termuxrc
 
-# Configurable settings
-: ${NDK:="${HOME}/lib/android-ndk"}
+# Configurable settings:
 : ${ANDROID_HOME:="${HOME}/lib/android-sdk"}
-if [ ! -d "$NDK" ]; then echo 'ERROR: $NDK not defined as pointing at a directory - define it pointing at a android NDK installation!'; exit 1; fi
+: ${NDK:="${HOME}/lib/android-ndk"}
 : ${TERMUX_MAKE_PROCESSES:='4'}
-: ${TERMUX_TOPDIR:="$HOME/termux"}
-: ${TERMUX_ARCH:="arm"} # (arm|aarch64|i686|x86_64) - the x86_64 arch is not yet used or tested.
-TERMUX_ARCH_BITS="32"
-if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then
-       TERMUX_ARCH_BITS="64"
-fi
-: ${TERMUX_CLANG:=""} # Set to non-empty to use clang.
-: ${TERMUX_HOST_PLATFORM:="${TERMUX_ARCH}-linux-android"}
-if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}eabi"; fi
+: ${TERMUX_TOPDIR:="$HOME/.termux-build"}
+: ${TERMUX_ARCH:="aarch64"} # (arm|aarch64|i686|x86_64) - the x86_64 arch is not yet used or tested.
 : ${TERMUX_PREFIX:='/data/data/com.termux/files/usr'}
 : ${TERMUX_ANDROID_HOME:='/data/data/com.termux/files/home'}
 : ${TERMUX_DEBUG:=""}
 : ${TERMUX_PROCESS_DEB:=""}
 : ${TERMUX_API_LEVEL:="21"}
-if [ "$TERMUX_CLANG" = "" ]; then
-       : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc4.9"}
-else
-       : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-clang38"}
+: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="24.0.1"}
+: ${TERMUX_NDK_VERSION:="12"}
+
+# Handle command-line arguments:
+show_usage () {
+    echo "Usage: ./build-package.sh [-a ARCH] PACKAGE"
+    echo "Build a package."
+    echo ""
+    exit 1
+}
+while getopts :a:h option
+do
+    case "$option" in
+        a) TERMUX_ARCH="$OPTARG";;
+        h) show_usage;;
+        ?) echo "./build-package.sh: illegal option -$OPTARG"; exit 1;;
+    esac
+done
+shift $(($OPTIND-1))
+if [ "$#" -ne 1 ]; then show_usage; fi
+
+# Check the NDK:
+if [ ! -d "$NDK" ]; then
+       echo 'ERROR: $NDK not defined as pointing at a directory - define it pointing at a android NDK installation!'
+       exit 1
 fi
-: ${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.
-TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx
-
-# We put this after system PATH to avoid picking up toolchain stripped python
-export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
-
-# Make $TERMUX_TAR and $TERMUX_TOUCH point at gnu versions:
-export TERMUX_TAR="tar"
-test `uname` = "Darwin" && TERMUX_TAR=gnutar
-export TERMUX_TOUCH="touch"
-test `uname` = "Darwin" && TERMUX_TOUCH=gtouch
-
-# Compute NDK version. We remove the first character (the r in e.g. r9d) to get a version number which can be used in packages):
-export TERMUX_NDK_VERSION=11
 if grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION" $NDK/source.properties; then
        :
 else
@@ -71,112 +49,56 @@ else
        exit 1
 fi
 
-export prefix=${TERMUX_PREFIX} # prefix is used by some makefiles
-#export ACLOCAL="aclocal -I $TERMUX_PREFIX/share/aclocal"
-export AR=$TERMUX_HOST_PLATFORM-ar
-if [ "$TERMUX_CLANG" = "" ]; then
-       export AS=${TERMUX_HOST_PLATFORM}-gcc
-       export CC=$TERMUX_HOST_PLATFORM-gcc
-       export CXX=$TERMUX_HOST_PLATFORM-g++
-       _SPECSFLAG="-specs=$TERMUX_SCRIPTDIR/termux.spec"
+# Check the package to build:
+TERMUX_PKG_NAME=`basename $1`
+export TERMUX_SCRIPTDIR=`cd $(dirname $0); pwd`
+if [[ $1 == *"/"* ]]; then
+  # Path to directory which may be outside this repo:
+  if [ ! -d $1 ]; then echo "ERROR: '$1' seems to be a path but is not a directory"; exit 1; fi
+  export TERMUX_PKG_BUILDER_DIR=`realpath $1`
 else
-       export AS=${TERMUX_HOST_PLATFORM}-gcc
-       export CC=$TERMUX_HOST_PLATFORM-clang
-       export CXX=$TERMUX_HOST_PLATFORM-clang++
-       # TODO: clang does not have specs file, how to ensure pie
-       # binaries gets built?
-       _SPECSFLAG=""
-fi
-export CPP=${TERMUX_HOST_PLATFORM}-cpp
-export CC_FOR_BUILD=gcc
-export LD=$TERMUX_HOST_PLATFORM-ld
-export OBJDUMP=$TERMUX_HOST_PLATFORM-objdump
-# Setup pkg-config for cross-compiling:
-export PKG_CONFIG=$TERMUX_STANDALONE_TOOLCHAIN/bin/${TERMUX_HOST_PLATFORM}-pkg-config
-export PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig
-export RANLIB=$TERMUX_HOST_PLATFORM-ranlib
-export READELF=$TERMUX_HOST_PLATFORM-readelf
-export STRIP=$TERMUX_HOST_PLATFORM-strip
-
-export CFLAGS="$_SPECSFLAG"
-export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib"
-
-if [ "$TERMUX_ARCH" = "arm" ]; then
-       CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
-       # "first flag instructs the linker to pick libgcc.a, libgcov.a, and
-       # crt*.o, which are tailored for armv7-a"
-       # - https://developer.android.com/ndk/guides/standalone_toolchain.html
-       LDFLAGS+=" -march=armv7-a -Wl,--fix-cortex-a8"
-elif [ $TERMUX_ARCH = "i686" ]; then
-       # From $NDK/docs/CPU-ARCH-ABIS.html:
-       CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse"
-elif [ $TERMUX_ARCH = "aarch64" ]; then
-       LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib"
-       LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib"
+  # Package name:
+  export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME
 fi
-
-if [ -n "$TERMUX_DEBUG" ]; then
-        CFLAGS+=" -g3 -Og -fstack-protector --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-else
-        CFLAGS+=" -Os"
+TERMUX_PKG_BUILDER_SCRIPT=$TERMUX_PKG_BUILDER_DIR/build.sh
+if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then
+       echo "ERROR: No build.sh script at supposed package dir $TERMUX_PKG_BUILDER_DIR!"
+       exit 1
 fi
 
-export CXXFLAGS="$CFLAGS"
-export CPPFLAGS="-I${TERMUX_PREFIX}/include"
-
-export ac_cv_func_getpwent=no
-export ac_cv_func_getpwnam=no
-export ac_cv_func_getpwuid=no
-
-if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
-       # See https://developer.android.com/ndk/guides/standalone_toolchain.html about toolchain naming.
-       if [ "i686" = $TERMUX_ARCH ]; then
-               _TERMUX_NDK_TOOLCHAIN_NAME="x86"
-       elif [ "x86_64" = $TERMUX_ARCH ]; then
-               _TERMUX_NDK_TOOLCHAIN_NAME="x86_64"
-       else
-               _TERMUX_NDK_TOOLCHAIN_NAME="$TERMUX_HOST_PLATFORM"
-       fi
-
-       if [ "$TERMUX_CLANG" = "" ]; then
-               _TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-4.9"
-       else
-               _TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-clang"
-       fi
-       bash $NDK/build/tools/make-standalone-toolchain.sh --platform=android-$TERMUX_API_LEVEL --toolchain=${_TERMUX_TOOLCHAIN} \
-               --install-dir=$TERMUX_STANDALONE_TOOLCHAIN
-        if [ "arm" = $TERMUX_ARCH ]; then
-                # Fix to allow e.g. <bits/c++config.h> to be included:
-                cp $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/arm-linux-androideabi/armv7-a/bits/* $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/bits
-        fi
-       cd $TERMUX_STANDALONE_TOOLCHAIN/sysroot
-       for f in $TERMUX_SCRIPTDIR/ndk_patches/*.patch; do
-               sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $f | \
-                       sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
-                       patch -p1;
-               echo "PATCHING FILE $f done!"
+# Handle 'all' arch:
+if [ $TERMUX_ARCH = 'all' ]; then
+       for arch in 'arm' 'i686' 'aarch64'; do
+               ./build-package.sh -a $arch $1
        done
-        # elf.h is taken from glibc since the elf.h in the NDK is lacking.
-       # sysexits.h is header-only and used by a few programs.
-        cp $TERMUX_SCRIPTDIR/ndk_patches/{elf.h,sysexits.h} $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include
+       exit
 fi
 
-export TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache"
-export TERMUX_COMMON_DEBDIR="$TERMUX_TOPDIR/_deb"
-mkdir -p $TERMUX_COMMON_CACHEDIR $TERMUX_COMMON_DEBDIR
+# 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.
+TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx
+TERMUX_JACK=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jack.jar
+TERMUX_JILL=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jill.jar
+# Make $TERMUX_TAR and $TERMUX_TOUCH point at gnu versions:
+export TERMUX_TAR="tar"
+test `uname` = "Darwin" && TERMUX_TAR=gtar
+export TERMUX_TOUCH="touch"
+test `uname` = "Darwin" && TERMUX_TOUCH=gtouch
 
-# Get fresh versions of config.sub and config.guess
-for f in config.sub config.guess; do test ! -f $TERMUX_COMMON_CACHEDIR/$f && curl "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=${f};hb=HEAD" > $TERMUX_COMMON_CACHEDIR/$f; done
-# Have a debian-binary file ready for deb packaging:
-test ! -f $TERMUX_COMMON_CACHEDIR/debian-binary && echo "2.0" > $TERMUX_COMMON_CACHEDIR/debian-binary
-# The host tuple that may be given to --host configure flag, but normally autodetected so not needed explicitly
-TERMUX_HOST_TUPLE=`sh $TERMUX_COMMON_CACHEDIR/config.guess`
+export prefix=${TERMUX_PREFIX} # prefix is used by some makefiles
+export PREFIX=${TERMUX_PREFIX} # PREFIX is used by some makefiles
+export TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache"
+export TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs"
+export PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig
+mkdir -p $TERMUX_COMMON_CACHEDIR $TERMUX_DEBDIR
 
 TERMUX_PKG_BUILDDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/build
 TERMUX_PKG_CACHEDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/cache
 TERMUX_PKG_MASSAGEDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/massage
 TERMUX_PKG_PACKAGEDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/package
 TERMUX_PKG_SRCDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/src
+TERMUX_PKG_SHA256=""
 TERMUX_PKG_TMPDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/tmp
 TERMUX_PKG_HOSTBUILD_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/host-build
 TERMUX_PKG_PLATFORM_INDEPENDENT=""
@@ -195,14 +117,17 @@ 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=""
 # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR:
 TERMUX_PKG_HOSTBUILD=""
 TERMUX_PKG_MAINTAINER="Fredrik Fornwall <fredrik@fornwall.net>"
+TERMUX_PKG_CLANG=no
 
 # Cleanup old state
-rm -Rf   $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_SRCDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_MASSAGEDIR
+rm -Rf $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_SRCDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_MASSAGEDIR
 
 # If $TERMUX_PREFIX already exists, it may have been built for a different arch
 TERMUX_ARCH_FILE=/data/TERMUX_ARCH
@@ -213,8 +138,6 @@ if [ -f "${TERMUX_ARCH_FILE}" ]; then
                 mkdir -p $TERMUX_DATA_BACKUPDIRS
                 TERMUX_DATA_PREVIOUS_BACKUPDIR=$TERMUX_DATA_BACKUPDIRS/$TERMUX_PREVIOUS_ARCH
                 TERMUX_DATA_CURRENT_BACKUPDIR=$TERMUX_DATA_BACKUPDIRS/$TERMUX_ARCH
-                echo "NOTE: Different archs - building for $TERMUX_ARCH, but current $TERMUX_PREVIOUS_ARCH"
-                echo "      Saving current /data/data to $TERMUX_DATA_PREVIOUS_BACKUPDIR"
                 # Save current /data (removing old backup if any)
                if test -e $TERMUX_DATA_PREVIOUS_BACKUPDIR; then
                        echo "ERROR: Directory already exists"
@@ -223,7 +146,6 @@ if [ -f "${TERMUX_ARCH_FILE}" ]; then
                 mv /data/data $TERMUX_DATA_PREVIOUS_BACKUPDIR
                 # Restore new one (if any)
                 if [ -d $TERMUX_DATA_CURRENT_BACKUPDIR ]; then
-                        echo "      Restoring old backupdir from $TERMUX_DATA_CURRENT_BACKUPDIR"
                         mv $TERMUX_DATA_CURRENT_BACKUPDIR /data/data
                 fi
         fi
@@ -233,35 +155,42 @@ 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,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:
-ln -f -s /bin/sh $TERMUX_PREFIX/bin/sh
+termux_download() {
+       URL="$1"
+       DESTINATION="$2"
+
+       TMPFILE=`mktemp $TERMUX_PKG_TMPDIR/download.$TERMUX_PKG_NAME.XXXXXXXXX`
+       echo "Downloading ${URL}"
+       TRYMAX=6
+       for try in $(seq 1 $TRYMAX); do
+               if curl -L --fail --retry 2 -o "$TMPFILE" "$URL"; then
+                       if [ $# = 3 ]; then
+                               # Optional checksum argument:
+                               echo $3  "$TMPFILE" | sha256sum --check --strict --quiet
+                       else
+                               echo "Note: No checksum of file"
+                               sha256sum $TMPFILE
+                       fi
+                       mv "$TMPFILE" "$DESTINATION"
+                       return
+               else
+                       echo "Download of $1 failed (attempt $try/$TRYMAX)" 1>&2
+                       sleep 45
+               fi
+       done
 
-if [ ! -f $PKG_CONFIG ]; then
-       echo "Creating pkg-config wrapper..."
-       # We use path to host pkg-config to avoid picking up a cross-compiled pkg-config later on
-       _HOST_PKGCONFIG=`which pkg-config`
-       mkdir -p $TERMUX_STANDALONE_TOOLCHAIN/bin $PKG_CONFIG_LIBDIR
-       cat > $PKG_CONFIG <<HERE
-#!/bin/sh
-export PKG_CONFIG_DIR=
-export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR
-# export PKG_CONFIG_SYSROOT_DIR=${TERMUX_PREFIX}
-exec $_HOST_PKGCONFIG "\$@"
-HERE
-       chmod +x $PKG_CONFIG
+       echo "Failed to download $1 - exiting" 1>&2
+       exit 1
+}
 
-       # Add a pkg-config file for the system zlib
-       cat > $PKG_CONFIG_LIBDIR/zlib.pc <<HERE
-Name: zlib
-Description: zlib compression library
-Version: 1.2.3
+# Have a debian-binary file ready for deb packaging:
+test ! -f $TERMUX_COMMON_CACHEDIR/debian-binary && echo "2.0" > $TERMUX_COMMON_CACHEDIR/debian-binary
+# 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`
 
-Requires:
-Libs: -L$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib -lz
-Cflags: -I$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include
-HERE
-fi
+# 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:
+ln -f -s /bin/sh $TERMUX_PREFIX/bin/sh
 
 TERMUX_ELF_CLEANER=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner
 TERMUX_ELF_CLEANER_SRC=$TERMUX_SCRIPTDIR/packages/termux-elf-cleaner/termux-elf-cleaner.cpp
@@ -269,12 +198,6 @@ if [ $TERMUX_ELF_CLEANER_SRC -nt $TERMUX_ELF_CLEANER ]; then
        g++ -std=c++11 -Wall -Wextra -pedantic -Os $TERMUX_ELF_CLEANER_SRC -o $TERMUX_ELF_CLEANER
 fi
 
-# Keep track of when build started so we can see what files have been created
-export TERMUX_BUILD_TS_FILE=$TERMUX_PKG_TMPDIR/timestamp_$TERMUX_PKG_NAME
-sleep 1 # Sleep so that any generated files above (such as zlib.c and $PREFIX/bin/sh)
-       #get older timestamp then TERMUX_BUILD_TS_FILE
-rm -f $TERMUX_BUILD_TS_FILE && touch $TERMUX_BUILD_TS_FILE
-
 # Run just after sourcing $TERMUX_PKG_BUILDER_SCRIPT
 termux_step_extract_package () {
         if [ -z "${TERMUX_PKG_SRCURL:=""}" ]; then
@@ -284,8 +207,8 @@ termux_step_extract_package () {
        cd $TERMUX_PKG_TMPDIR
        filename=`basename $TERMUX_PKG_SRCURL`
        file=$TERMUX_PKG_CACHEDIR/$filename
-       # Set "TERMUX_PKG_NO_SRC_CACHE=yes" in package to never cache packages, such as in git builds:
-       test -n ${TERMUX_PKG_NO_SRC_CACHE-""} -o ! -f $file && curl --retry 3 -o $file -L $TERMUX_PKG_SRCURL
+       test ! -f $file && termux_download $TERMUX_PKG_SRCURL $file $TERMUX_PKG_SHA256
+
        if [ "x$TERMUX_PKG_FOLDERNAME" = "x" ]; then
                folder=`basename $filename .tar.bz2` && folder=`basename $folder .tar.gz` && folder=`basename $folder .tar.xz` && folder=`basename $folder .tar.lz` && folder=`basename $folder .tgz` && folder=`basename $folder .zip`
                folder=`echo $folder | sed 's/_/-/'` # dpkg uses _ in tar filename, but - in folder
@@ -294,7 +217,7 @@ termux_step_extract_package () {
        fi
        rm -Rf $folder
        if [ ${file##*.} = zip ]; then
-               unzip $file
+               unzip -q $file
        else
                $TERMUX_TAR xf $file
        fi
@@ -319,11 +242,11 @@ termux_step_patch_package () {
        for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,}; do
                test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | \
                        sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
-                       patch -p1
+                       patch --silent -p1
        done
 
-       find . -name config.sub -exec chmod u+w '{}' \; -exec cp $TERMUX_COMMON_CACHEDIR/config.sub '{}' \;
-       find . -name config.guess -exec chmod u+w '{}' \; -exec cp $TERMUX_COMMON_CACHEDIR/config.guess '{}' \;
+       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 '{}' \;
 }
 
 termux_step_pre_configure () {
@@ -361,9 +284,6 @@ termux_step_configure () {
        for f in $TERMUX_PREFIX/bin/*config; do
                test -f $f && cp $f $TERMUX_PKG_TMPDIR/config-scripts
        done
-       set +e +o pipefail
-       find $TERMUX_PKG_TMPDIR/config-scripts | xargs file | grep -F " script" | cut -f 1 -d : | xargs sed -i -E "s@^#\!/system/bin/sh@#\!/bin/sh@"
-       set -e -o pipefail
        export PATH=$TERMUX_PKG_TMPDIR/config-scripts:$PATH
 
        # See http://wiki.buici.com/xwiki/bin/view/Programing+C+and+C%2B%2B/Autoconf+and+RPL_MALLOC
@@ -465,23 +385,23 @@ 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)
+        # Remove world permissions and add write permissions.
+       # The -f flag is used to suppress warnings about dangling symlinks (such
+       # as ones to /system/... which may not exist on the build machine):
+        find . -exec chmod -f u+w,o-rwx \{\} \;
        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
 
@@ -493,7 +413,11 @@ termux_step_massage () {
                 _DEVEL_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-dev.subpackage.sh
                 echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > $_DEVEL_SUBPACKAGE_FILE
                 echo TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\" >> $_DEVEL_SUBPACKAGE_FILE
-                echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE
+               if [ -n "$TERMUX_PKG_DEVPACKAGE_DEPENDS" ]; then
+                       echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME,$TERMUX_PKG_DEVPACKAGE_DEPENDS\" >> $_DEVEL_SUBPACKAGE_FILE
+               else
+                       echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE
+               fi
                if [ x$TERMUX_PKG_CONFLICTS != x ]; then
                        # Assume that dev packages conflicts as well.
                        echo "TERMUX_SUBPKG_CONFLICTS=${TERMUX_PKG_CONFLICTS}-dev" >> $_DEVEL_SUBPACKAGE_FILE
@@ -506,7 +430,6 @@ termux_step_massage () {
                SUB_PKG_NAME=`basename $subpackage .subpackage.sh`
                 # Default value is same as main package, but sub package may override:
                 TERMUX_SUBPKG_PLATFORM_INDEPENDENT=$TERMUX_PKG_PLATFORM_INDEPENDENT
-               echo "$SUB_PKG_NAME => $subpackage"
                 SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME
                 TERMUX_SUBPKG_DEPENDS=""
                TERMUX_SUBPKG_CONFLICTS=""
@@ -549,7 +472,7 @@ HERE
                $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
+                TERMUX_SUBPKG_DEBFILE=$TERMUX_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.xz \
@@ -595,7 +518,7 @@ termux_setup_golang () {
                exit 1
        fi
 
-       local TERMUX_GO_VERSION=go1.6.2
+       local TERMUX_GO_VERSION=go1.7.1
        local TERMUX_GO_PLATFORM=linux-amd64
        test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 
@@ -607,12 +530,20 @@ termux_setup_golang () {
 
        local TERMUX_BUILDGO_TAR=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz
        rm -Rf $TERMUX_COMMON_CACHEDIR/go $TERMUX_BUILDGO_FOLDER
-       curl -o $TERMUX_BUILDGO_TAR https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz
+       termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz $TERMUX_BUILDGO_TAR
         ( cd $TERMUX_COMMON_CACHEDIR; tar xf $TERMUX_BUILDGO_TAR; mv go $TERMUX_BUILDGO_FOLDER; rm $TERMUX_BUILDGO_TAR )
 }
 
 source $TERMUX_PKG_BUILDER_SCRIPT
 
+if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" -a "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then
+       echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"
+       exit 0
+fi
+
+echo "termux - building $1 for arch $TERMUX_ARCH..."
+test -t 1 && printf "\033]0;$1...\007"
+
 # Compute full version:
 TERMUX_PKG_FULLVERSION=$TERMUX_PKG_VERSION
 if [ "$TERMUX_PKG_BUILD_REVISION" != "0" -o "$TERMUX_PKG_FULLVERSION" != "${TERMUX_PKG_FULLVERSION/-/}" ]; then
@@ -620,6 +551,180 @@ if [ "$TERMUX_PKG_BUILD_REVISION" != "0" -o "$TERMUX_PKG_FULLVERSION" != "${TERM
        TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_BUILD_REVISION"
 fi
 
+# Compute standalone toolchain dir, bitness of arch and name of host platform:
+TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}-"
+if [ "$TERMUX_PKG_CLANG" = "no" ]; 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"
+
+# We put this after system PATH to avoid picking up toolchain stripped python
+export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
+
+if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then
+       TERMUX_ARCH_BITS=64
+else
+       TERMUX_ARCH_BITS=32
+fi
+TERMUX_HOST_PLATFORM="${TERMUX_ARCH}-linux-android"
+if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}eabi"; fi
+
+export AR=$TERMUX_HOST_PLATFORM-ar
+if [ "$TERMUX_PKG_CLANG" = "no" ]; then
+       export AS=${TERMUX_HOST_PLATFORM}-gcc
+       export CC=$TERMUX_HOST_PLATFORM-gcc
+       export CXX=$TERMUX_HOST_PLATFORM-g++
+       _SPECSFLAG="-specs=$TERMUX_SCRIPTDIR/termux.spec"
+else
+       export AS=${TERMUX_HOST_PLATFORM}-gcc
+       export CC=$TERMUX_HOST_PLATFORM-clang
+       export CXX=$TERMUX_HOST_PLATFORM-clang++
+       # TODO: clang does not have specs file, how to ensure pie
+       # binaries gets built?
+       _SPECSFLAG=""
+fi
+export CPP=${TERMUX_HOST_PLATFORM}-cpp
+export CC_FOR_BUILD=gcc
+export LD=$TERMUX_HOST_PLATFORM-ld
+export OBJDUMP=$TERMUX_HOST_PLATFORM-objdump
+# Setup pkg-config for cross-compiling:
+export PKG_CONFIG=$TERMUX_STANDALONE_TOOLCHAIN/bin/${TERMUX_HOST_PLATFORM}-pkg-config
+export RANLIB=$TERMUX_HOST_PLATFORM-ranlib
+export READELF=$TERMUX_HOST_PLATFORM-readelf
+export STRIP=$TERMUX_HOST_PLATFORM-strip
+
+export CFLAGS="$_SPECSFLAG"
+export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib"
+
+if [ "$TERMUX_ARCH" = "arm" ]; then
+       CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
+       # "first flag instructs the linker to pick libgcc.a, libgcov.a, and
+       # crt*.o, which are tailored for armv7-a"
+       # - https://developer.android.com/ndk/guides/standalone_toolchain.html
+       LDFLAGS+=" -march=armv7-a -Wl,--fix-cortex-a8"
+elif [ $TERMUX_ARCH = "i686" ]; then
+       # From $NDK/docs/CPU-ARCH-ABIS.html:
+       CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse"
+elif [ $TERMUX_ARCH = "aarch64" ]; then
+       LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib"
+       LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib"
+elif [ $TERMUX_ARCH = "x86_64" ]; then
+       :
+else
+       echo "Error: Invalid arch '$TERMUX_ARCH' - support arches are 'arm', 'i686', 'aarch64', 'x86_64'"
+       exit 1
+fi
+
+if [ -n "$TERMUX_DEBUG" ]; then
+        CFLAGS+=" -g3 -Og -fstack-protector --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+else
+        CFLAGS+=" -Os"
+fi
+
+export CXXFLAGS="$CFLAGS"
+export CPPFLAGS="-I${TERMUX_PREFIX}/include"
+
+export ac_cv_func_getpwent=no
+export ac_cv_func_getpwnam=no
+export ac_cv_func_getpwuid=no
+
+if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
+       # See https://developer.android.com/ndk/guides/standalone_toolchain.html about toolchain naming.
+       if [ "i686" = $TERMUX_ARCH ]; then
+               _TERMUX_NDK_TOOLCHAIN_NAME="x86"
+       elif [ "x86_64" = $TERMUX_ARCH ]; then
+               _TERMUX_NDK_TOOLCHAIN_NAME="x86_64"
+       else
+               _TERMUX_NDK_TOOLCHAIN_NAME="$TERMUX_HOST_PLATFORM"
+       fi
+
+       if [ "$TERMUX_PKG_CLANG" = "no" ]; then
+               _TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-4.9"
+       else
+               _TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-clang"
+       fi
+
+       # Do not put toolchain in place until we are done with setup, to avoid having a half setup
+       # toolchain left in place if something goes wrong (or process is just aborted):
+       _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp
+       rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR
+
+       bash $NDK/build/tools/make-standalone-toolchain.sh --platform=android-$TERMUX_API_LEVEL --toolchain=${_TERMUX_TOOLCHAIN} \
+               --install-dir=$_TERMUX_TOOLCHAIN_TMPDIR
+        if [ "arm" = $TERMUX_ARCH ]; then
+                # Fix to allow e.g. <bits/c++config.h> to be included:
+                cp $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/arm-linux-androideabi/armv7-a/bits/* $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/bits
+        fi
+       cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot
+       for f in $TERMUX_SCRIPTDIR/ndk_patches/*.patch; do
+               sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $f | \
+                       sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
+                       patch --silent -p1;
+       done
+        # elf.h is taken from glibc since the elf.h in the NDK is lacking.
+       # sysexits.h is header-only and used by a few programs.
+       cp $TERMUX_SCRIPTDIR/ndk_patches/{elf.h,sysexits.h} $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include
+       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
+
+if [ ! -f $PKG_CONFIG ]; then
+       echo "Creating pkg-config wrapper..."
+       # We use path to host pkg-config to avoid picking up a cross-compiled pkg-config later on
+       _HOST_PKGCONFIG=`which pkg-config`
+       mkdir -p $TERMUX_STANDALONE_TOOLCHAIN/bin $PKG_CONFIG_LIBDIR
+       cat > $PKG_CONFIG <<HERE
+#!/bin/sh
+export PKG_CONFIG_DIR=
+export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR
+# export PKG_CONFIG_SYSROOT_DIR=${TERMUX_PREFIX}
+exec $_HOST_PKGCONFIG "\$@"
+HERE
+       chmod +x $PKG_CONFIG
+
+       # Add a pkg-config file for the system zlib
+       cat > $PKG_CONFIG_LIBDIR/zlib.pc <<HERE
+Name: zlib
+Description: zlib compression library
+Version: 1.2.3
+
+Requires:
+Libs: -L$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib -lz
+Cflags: -I$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include
+HERE
+fi
+
+# Keep track of when build started so we can see what files have been created.
+# We start by sleeping so that any generated files above (such as zlib.pc) get
+# an older timestamp than the TERMUX_BUILD_TS_FILE.
+sleep 1
+TERMUX_BUILD_TS_FILE=$TERMUX_PKG_TMPDIR/timestamp_$TERMUX_PKG_NAME
+touch $TERMUX_BUILD_TS_FILE
+
 # Start by extracting the package src into $TERMUX_PKG_SRCURL:
 termux_step_extract_package
 # Optional post processing:
@@ -629,7 +734,7 @@ termux_step_post_extract_package
 if [ "x$TERMUX_PKG_HOSTBUILD" != "x" ]; then
        cd $TERMUX_PKG_SRCDIR
        for patch in $TERMUX_PKG_BUILDER_DIR/*.patch.beforehostbuild; do
-               test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | patch -p1
+               test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | patch --silent -p1
        done
 
         if [ -f "$TERMUX_PKG_HOSTBUILD_DIR/TERMUX_BUILT_FOR_$TERMUX_PKG_VERSION" ]; then
@@ -737,6 +842,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
@@ -747,7 +853,7 @@ termux_step_create_debscripts
 # 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
+TERMUX_PKG_DEBFILE=$TERMUX_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 \