libpng: Update from 1.6.27 to 1.6.28

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 9eac1f0..f0f1190 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -62,7 +62,7 @@ termux_setup_golang() {
                termux_error_exit "Unsupported arch: $TERMUX_ARCH"
        fi
 
-       local TERMUX_GO_VERSION=go1.7.4
+       local TERMUX_GO_VERSION=go1.8rc1
        local TERMUX_GO_PLATFORM=linux-amd64
        test "$(uname)" = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 
@@ -131,7 +131,7 @@ termux_step_handle_arguments() {
 
        # Handle 'all' arch:
        if [ -n "${TERMUX_ARCH+x}" ] && [ "${TERMUX_ARCH}" = 'all' ]; then
-               for arch in 'arm' 'i686' 'aarch64' 'x86_64'; do
+               for arch in 'aarch64' 'arm' 'i686' 'x86_64'; do
                        ./build-package.sh -a $arch "$1"
                done
                exit
@@ -207,7 +207,7 @@ termux_step_setup_variables() {
        TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}"
        # Bump the below version if a change is made in toolchain setup to ensure
        # that everyone gets an updated toolchain:
-       TERMUX_STANDALONE_TOOLCHAIN+="-v5"
+       TERMUX_STANDALONE_TOOLCHAIN+="-v9"
 
        export TERMUX_TAR="tar"
        export TERMUX_TOUCH="touch"
@@ -431,20 +431,22 @@ termux_step_setup_toolchain() {
        # We put this after system PATH to avoid picking up toolchain stripped python
        export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
 
-       export AR=$TERMUX_HOST_PLATFORM-ar
+       export CFLAGS=""
+       export LDFLAGS="-L${TERMUX_PREFIX}/lib"
+
        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"
+               LDFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
+               CFLAGS+=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
        else
                export AS=${TERMUX_HOST_PLATFORM}-clang
                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 AR=$TERMUX_HOST_PLATFORM-ar
        export CPP=${TERMUX_HOST_PLATFORM}-cpp
        export CC_FOR_BUILD=gcc
        export LD=$TERMUX_HOST_PLATFORM-ld
@@ -455,24 +457,21 @@ termux_step_setup_toolchain() {
        export READELF=$TERMUX_HOST_PLATFORM-readelf
        export STRIP=$TERMUX_HOST_PLATFORM-strip
 
-       export CFLAGS="$_SPECSFLAG"
-       export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib"
        # Android 7 started to support DT_RUNPATH (but not DT_RPATH), so we may want
        # LDFLAGS+="-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags"
        # and no longer remove DT_RUNPATH in termux-elf-cleaner.
 
        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
+               # https://developer.android.com/ndk/guides/standalone_toolchain.html#abi_compatibility:
+               # "We recommend using the -mthumb compiler flag to force the generation of 16-bit Thumb-2 instructions".
+               # With r13 of the ndk ruby 2.4.0 segfaults when built on arm with clang without -mthumb.
+               CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb"
                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
@@ -516,18 +515,30 @@ termux_step_setup_toolchain() {
                        --arch $_NDK_ARCHNAME \
                        --install-dir $_TERMUX_TOOLCHAIN_TMPDIR
 
-               local w
-               for w in aarch64-linux-android-clang clang; do
-                       cp $TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w
-                       sed -i 's/COMPILER/clang38/' $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w
-                       cp $TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w++
-                       sed -i 's/COMPILER/clang38++/' $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w++
+               local wrapped plusplus CLANG_TARGET=$TERMUX_HOST_PLATFORM
+               if [ $TERMUX_ARCH = arm ]; then CLANG_TARGET=${CLANG_TARGET/arm-/armv7a-}; fi
+               for wrapped in ${TERMUX_HOST_PLATFORM}-clang clang; do
+                       for plusplus in "" "++"; do
+                               local FILE_TO_REPLACE=$_TERMUX_TOOLCHAIN_TMPDIR/bin/${wrapped}${plusplus}
+                               if [ ! -f $FILE_TO_REPLACE ]; then
+                                       termux_error_exit "No toolchain file to override: $FILE_TO_REPLACE"
+                               fi
+                               cp $TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper $FILE_TO_REPLACE
+                               sed -i "s/COMPILER/clang38$plusplus/" $FILE_TO_REPLACE
+                               sed -i "s/CLANG_TARGET/$CLANG_TARGET/" $FILE_TO_REPLACE
+                       done
                done
 
                if [ "$TERMUX_ARCH" = "arm" ]; 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
+               elif [ "$TERMUX_ARCH" = "aarch64" ]; then
+                       # Use gold by default to work around https://github.com/android-ndk/ndk/issues/148
+                       cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \
+                          $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld
+                       cp $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld.gold \
+                          $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld
                fi
 
                cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot
@@ -666,12 +677,6 @@ termux_step_configure_autotools () {
 termux_step_configure_cmake () {
        termux_setup_cmake
 
-       if [ -n "$_SPECSFLAG" ]; then
-               CFLAGS=${CFLAGS#$_SPECSFLAG}
-               CXXFLAGS=${CXXFLAGS#$_SPECSFLAG}
-               LDFLAGS=${LDFLAGS#$_SPECSFLAG}
-       fi
-
        local TOOLCHAIN_ARGS="-DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TERMUX_STANDALONE_TOOLCHAIN"
        local BUILD_TYPE=MinSizeRel
        test -n "$TERMUX_DEBUG" && BUILD_TYPE=Debug