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

diff --git a/build-package.sh b/build-package.sh
index 4e52fd9a..7592de09 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -161,7 +161,8 @@ termux_download() {
 
 	TMPFILE=`mktemp $TERMUX_PKG_TMPDIR/download.$TERMUX_PKG_NAME.XXXXXXXXX`
 	echo "Downloading ${URL}"
-	for i in 1 2 3 4 5 6; do
+	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:
@@ -173,7 +174,7 @@ termux_download() {
 			mv "$TMPFILE" "$DESTINATION"
 			return
 		else
-			echo "Download of $1 failed (attempt $i/3)" 1>&2
+			echo "Download of $1 failed (attempt $try/$TRYMAX)" 1>&2
 			sleep 45
 		fi
 	done
@@ -182,17 +183,10 @@ termux_download() {
 	exit 1
 }
 
-# Get fresh versions of config.sub and config.guess
-for f in config.sub config.guess; do
-	if [ ! -f $TERMUX_COMMON_CACHEDIR/$f ]; then
-		termux_download "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=${f};hb=HEAD" $TERMUX_COMMON_CACHEDIR/$f
-	fi
-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`
+TERMUX_HOST_TUPLE=`sh $TERMUX_SCRIPTDIR/scripts/config.guess`
 
 # 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:
@@ -251,8 +245,8 @@ termux_step_patch_package () {
 			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 () {
@@ -376,8 +370,12 @@ termux_step_massage () {
 		rm -Rf share/info
 	fi
 
-	# Remove other docs:
-	rm -Rf share/doc share/locale
+	# Remove locale files we're not interested in::
+	rm -Rf share/locale
+	if [ -z ${TERMUX_PKG_KEEP_SHARE_DOC+x} ]; then
+		# Remove info pages:
+		rm -Rf share/doc
+	fi
 
 	# Remove old kept libraries (readline):
 	find . -name '*.old' -delete
@@ -566,7 +564,7 @@ else
 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"
+TERMUX_STANDALONE_TOOLCHAIN+="-v2"
 
 # We put this after system PATH to avoid picking up toolchain stripped python
 export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
@@ -648,7 +646,7 @@ if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
 		_TERMUX_NDK_TOOLCHAIN_NAME="$TERMUX_HOST_PLATFORM"
 	fi
 
-	if [ "$TERMUX_PKG_CLANG" = "" ]; then
+	if [ "$TERMUX_PKG_CLANG" = "no" ]; then
 		_TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-4.9"
 	else
 		_TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-clang"
@@ -698,31 +696,26 @@ if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ]; then
 	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
+# Create 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
+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
+Libs: -lz
 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