Fixes for building on a mac

[termux-packages] / build-package.sh

diff --git a/build-package.sh b/build-package.sh
index 34e9181..c1289ef 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -18,7 +18,7 @@ test -f $HOME/.termuxrc && . $HOME/.termuxrc
 : ${TERMUX_PROCESS_DEB:=""}
 : ${TERMUX_API_LEVEL:="21"}
 : ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.3"}
-: ${TERMUX_NDK_VERSION:="11"}
+: ${TERMUX_NDK_VERSION:="12"}
 
 # Handle command-line arguments:
 show_usage () {
@@ -51,7 +51,7 @@ 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}-api${TERMUX_API_LEVEL}-"
+TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/android-standalone-toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}-"
 if [ "$TERMUX_CLANG" = "" ]; then
        TERMUX_STANDALONE_TOOLCHAIN+="gcc4.9"
 else
@@ -103,7 +103,7 @@ export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
 
 # Make $TERMUX_TAR and $TERMUX_TOUCH point at gnu versions:
 export TERMUX_TAR="tar"
-test `uname` = "Darwin" && TERMUX_TAR=gnutar
+test `uname` = "Darwin" && TERMUX_TAR=gtar
 export TERMUX_TOUCH="touch"
 test `uname` = "Darwin" && TERMUX_TOUCH=gtouch