Export PREFIX in build-package.sh (fixes #327)

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index c670f37..c925078 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -90,9 +90,6 @@ if [ $TERMUX_ARCH = 'all' ]; then
        exit
 fi
 
-echo "termux - building $1 for arch $TERMUX_ARCH..."
-test -t 1 && printf "\033]0;$1...\007"
-
 # We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH
 # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
 # the standalone toolchain.
@@ -110,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
@@ -278,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
@@ -354,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
@@ -364,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
@@ -683,6 +680,14 @@ termux_setup_golang () {
 
 source $TERMUX_PKG_BUILDER_SCRIPT
 
+if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" -a "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then
+       echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"
+       exit 0
+fi
+
+echo "termux - building $1 for arch $TERMUX_ARCH..."
+test -t 1 && printf "\033]0;$1...\007"
+
 # Compute full version:
 TERMUX_PKG_FULLVERSION=$TERMUX_PKG_VERSION
 if [ "$TERMUX_PKG_BUILD_REVISION" != "0" -o "$TERMUX_PKG_FULLVERSION" != "${TERMUX_PKG_FULLVERSION/-/}" ]; then