X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/f643ff600c4671c1e92f6fb20263fab924b5c41f..3bbce8b0e3b214fd114761c3668d722a2facda7b:/build-package.sh diff --git a/build-package.sh b/build-package.sh index f7da4993..917b0b93 100755 --- a/build-package.sh +++ b/build-package.sh @@ -43,7 +43,7 @@ if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}e : ${TERMUX_GCC_VERSION:="4.9"} : ${TERMUX_API_LEVEL:="21"} : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc${TERMUX_GCC_VERSION}"} -: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="22.0.1"} +: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.0"} # 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. @@ -183,7 +183,7 @@ TERMUX_PKG_MAINTAINER="Fredrik Fornwall " # Cleanup old state rm -Rf $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_SRCDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_MASSAGEDIR # Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build) -mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,lib,share,tmp} +mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp} # If $TERMUX_PREFIX already exists, it may have been built for a different arch TERMUX_ARCH_FILE=/data/TERMUX_ARCH