X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a465e17ac955a7a8fd237e9a24820bc4e3cd4c9b..18c1abaac4ad33847e6ab8f4d0cf0d0e7b63d3ad:/build-package.sh diff --git a/build-package.sh b/build-package.sh index dce89e2c..4eeeac10 100755 --- a/build-package.sh +++ b/build-package.sh @@ -74,7 +74,7 @@ termux_setup_golang() { termux_error_exit "Unsupported arch: $TERMUX_ARCH" fi - local TERMUX_GO_VERSION=go1.10 + local TERMUX_GO_VERSION=go1.10.1 local TERMUX_GO_PLATFORM=linux-amd64 local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION} @@ -87,7 +87,7 @@ termux_setup_golang() { rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER" termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \ "$TERMUX_BUILDGO_TAR" \ - b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33 + 72d820dec546752e5a8303b33b009079c15c2390ce76d67cf514991646c6127b ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" ) } @@ -110,7 +110,7 @@ termux_setup_ninja() { # Utility function to setup a current meson build system. termux_setup_meson() { termux_setup_ninja - local MESON_VERSION=0.44.0 + local MESON_VERSION=0.45.1 local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION-v1 if [ ! -d "$MESON_FOLDER" ]; then local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz @@ -119,10 +119,8 @@ termux_setup_meson() { termux_download \ https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \ $MESON_TAR_FILE \ - 50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b + 4d0bb0dbb1bb556cb7a4092fdfea3d6e76606bd739a4bc97481c2d7bc6200afb tar xf "$MESON_TAR_FILE" -C "$TERMUX_PKG_TMPDIR" - cd $MESON_TMP_FOLDER - patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch mv $MESON_TMP_FOLDER $MESON_FOLDER fi TERMUX_MESON="$MESON_FOLDER/meson.py" @@ -166,8 +164,8 @@ termux_setup_meson() { # Utility function to setup a current cmake build system termux_setup_cmake() { - local TERMUX_CMAKE_MAJORVESION=3.10 - local TERMUX_CMAKE_MINORVERSION=3 + local TERMUX_CMAKE_MAJORVESION=3.11 + local TERMUX_CMAKE_MINORVERSION=1 local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME @@ -175,7 +173,7 @@ termux_setup_cmake() { if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \ "$TERMUX_CMAKE_TARFILE" \ - 9e7c48b797484f74c5ee3ae55132b40b16ed8e81ee762402da8971205b0a896b + 3aa8d3b53903563bdc13dfec80716c286b2228db36ef65c23bc616f9bb930367 rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR" mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \ @@ -261,7 +259,7 @@ termux_step_setup_variables() { : "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}" : "${TERMUX_DEBUG:=""}" : "${TERMUX_PKG_API_LEVEL:="21"}" - : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="27.0.1"}" + : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="27.0.3"}" : "${TERMUX_NDK_VERSION:="16"}" if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then