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

diff --git a/build-package.sh b/build-package.sh
index c9250781..bed59bbc 100755
--- 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
@@ -208,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
@@ -235,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=""
@@ -535,7 +561,7 @@ termux_step_massage () {
         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*'
+                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*'
 	fi
         # Fix shebang paths:
         for file in `find -L . -type f`; do
@@ -544,7 +570,7 @@ termux_step_massage () {
 	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
+		find . -type f -print0 | xargs -r -0 $TERMUX_ELF_CLEANER
 	fi
 
 	test ! -z "$TERMUX_PKG_RM_AFTER_INSTALL" && rm -Rf $TERMUX_PKG_RM_AFTER_INSTALL
@@ -812,6 +838,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