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

diff --git a/build-package.sh b/build-package.sh
index 4c00bef8..f0f11903 100755
--- 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
 
@@ -82,7 +82,7 @@ termux_setup_golang() {
 # Utility function for cmake-built packages to setup a current cmake.
 termux_setup_cmake() {
 	local TERMUX_CMAKE_MAJORVESION=3.7
-	local TERMUX_CMAKE_MINORVERSION=1
+	local TERMUX_CMAKE_MINORVERSION=2
 	local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
 	local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz
 	local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -90,7 +90,7 @@ termux_setup_cmake() {
 	if [ ! -d $TERMUX_CMAKE_FOLDER ]; then
 		termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
 		                $TERMUX_CMAKE_TARFILE \
-		                7b4b7a1d9f314f45722899c0521c261e4bfab4a6b532609e37fef391da6bade2
+		                0e6ec35d4fa9bf79800118916b51928b6471d5725ff36f1d0de5ebb34dcd5406
 		rm -Rf $TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64
 		tar xf $TERMUX_CMAKE_TARFILE -C $TERMUX_PKG_TMPDIR
 		mv $TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64 \
@@ -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+="-v4"
+	TERMUX_STANDALONE_TOOLCHAIN+="-v9"
 
 	export TERMUX_TAR="tar"
 	export TERMUX_TOUCH="touch"
@@ -247,7 +247,7 @@ termux_step_setup_variables() {
 	# Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR:
 	TERMUX_PKG_HOSTBUILD=""
 	TERMUX_PKG_MAINTAINER="Fredrik Fornwall @fornwall"
-	TERMUX_PKG_CLANG=no # does nothing for cmake based packages. clang is chosen by cmake
+	TERMUX_PKG_CLANG=yes # does nothing for cmake based packages. clang is chosen by cmake
 	TERMUX_PKG_FORCE_CMAKE=no # if the package has autotools as well as cmake, then set this to prefer cmake
 
 	unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
@@ -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}-gcc
+		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
@@ -501,7 +500,7 @@ termux_step_setup_toolchain() {
 	if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
 		# 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
+		local _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp
 		rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR
 
 		local _NDK_ARCHNAME=$TERMUX_ARCH
@@ -510,15 +509,36 @@ termux_step_setup_toolchain() {
 		elif [ "$TERMUX_ARCH" = "i686" ]; then
 			_NDK_ARCHNAME=x86
 		fi
+
 		"$NDK/build/tools/make_standalone_toolchain.py" \
 			--api "$TERMUX_API_LEVEL" \
 			--arch $_NDK_ARCHNAME \
 			--install-dir $_TERMUX_TOOLCHAIN_TMPDIR
 
+		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
@@ -657,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
@@ -670,11 +684,15 @@ termux_step_configure_cmake () {
 	local CMAKE_PROC=$TERMUX_ARCH
 	test $CMAKE_PROC == "arm" && CMAKE_PROC='armv7-a'
 
+	# XXX: CMAKE_{AR,RANLIB} needed for at least jsoncpp build to not
+	# pick up cross compiled binutils tool in $PREFIX/bin:
 	cmake -G 'Unix Makefiles' $TERMUX_PKG_SRCDIR \
+		-DCMAKE_AR=`which $AR` \
+		-DCMAKE_RANLIB=`which $RANLIB` \
 		-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
 		-DCMAKE_CROSSCOMPILING=True \
 		-DCMAKE_C_FLAGS="$CFLAGS $CPPFLAGS" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS $CPPFLAGS" \
 		-DCMAKE_LINKER="$TERMUX_STANDALONE_TOOLCHAIN/bin/$LD $LDFLAGS" \
 		-DCMAKE_FIND_ROOT_PATH=$TERMUX_PREFIX \
 		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
@@ -691,7 +709,7 @@ termux_step_configure_cmake () {
 }
 
 termux_step_configure () {
-	if [ "$TERMUX_PKG_FORCE_CMAKE" == 'no' -a -f "$TERMUX_PKG_SRCDIR/configure" ]; then
+	if [ "$TERMUX_PKG_FORCE_CMAKE" == 'no' ] && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then
 		termux_step_configure_autotools
 	elif [ -f "$TERMUX_PKG_SRCDIR/CMakeLists.txt" ]; then
 		termux_step_configure_cmake
@@ -707,7 +725,7 @@ termux_step_make() {
 		if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then
 			make -j $TERMUX_MAKE_PROCESSES
 		else
-		make -j $TERMUX_MAKE_PROCESSES ${TERMUX_PKG_EXTRA_MAKE_ARGS}
+			make -j $TERMUX_MAKE_PROCESSES ${TERMUX_PKG_EXTRA_MAKE_ARGS}
 		fi
 	fi
 }