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

diff --git a/build-package.sh b/build-package.sh
index 4a2918db..c9250781 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -107,7 +107,8 @@ export TERMUX_TOUCH="touch"
 test `uname` = "Darwin" && TERMUX_TOUCH=gtouch
 
 export prefix=${TERMUX_PREFIX} # prefix is used by some makefiles
-#export ACLOCAL="aclocal -I $TERMUX_PREFIX/share/aclocal"
+export PREFIX=${TERMUX_PREFIX} # PREFIX is used by some makefiles
+
 export AR=$TERMUX_HOST_PLATFORM-ar
 if [ "$TERMUX_CLANG" = "" ]; then
 	export AS=${TERMUX_HOST_PLATFORM}-gcc
@@ -275,13 +276,13 @@ termux_download() {
         DESTINATION="$2"
 
         TMPFILE=`mktemp $TERMUX_PKG_TMPDIR/download.XXXXXXXXX`
-        for i in 1 2 3; do
+        for i in 1 2 3 4 5 6; do
                 if curl -L --fail --retry 2 -o "$TMPFILE" "$URL"; then
                         mv "$TMPFILE" "$DESTINATION"
                         return
                 else
                         echo "Download of $1 failed (attempt $i/3)" 1>&2
-                        sleep 6
+                        sleep 45
                 fi
         done
         echo "Failed to download $1 - exiting" 1>&2
@@ -351,8 +352,7 @@ 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 && termux_download $TERMUX_PKG_SRCURL $file
+	test ! -f $file && termux_download $TERMUX_PKG_SRCURL $file
 	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
@@ -361,7 +361,7 @@ termux_step_extract_package () {
 	fi
 	rm -Rf $folder
 	if [ ${file##*.} = zip ]; then
-		unzip $file
+		unzip -q $file
 	else
 		$TERMUX_TAR xf $file
 	fi