diff --git a/build-package.sh b/build-package.sh index 53628e7d0050ac4..4149a5ca51abcc9 100755 --- a/build-package.sh +++ b/build-package.sh @@ -237,8 +237,8 @@ source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_handle_host_build.sh" source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_host_build.sh" # Setup a standalone Android NDK toolchain. Called from termux_step_setup_toolchain. -# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_27.sh -source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_27.sh" +# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_27b.sh +source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_27b.sh" # Setup a standalone Android NDK 23c toolchain. Called from termux_step_setup_toolchain. # shellcheck source=scripts/build/toolchain/termux_setup_toolchain_23c.sh diff --git a/ndk-patches/27/bits-struct_file.h.patch b/ndk-patches/27b/bits-struct_file.h.patch similarity index 100% rename from ndk-patches/27/bits-struct_file.h.patch rename to ndk-patches/27b/bits-struct_file.h.patch diff --git a/ndk-patches/27/dirent.h.patch b/ndk-patches/27b/dirent.h.patch similarity index 100% rename from ndk-patches/27/dirent.h.patch rename to ndk-patches/27b/dirent.h.patch diff --git a/ndk-patches/27/grp.h.patch b/ndk-patches/27b/grp.h.patch similarity index 100% rename from ndk-patches/27/grp.h.patch rename to ndk-patches/27b/grp.h.patch diff --git a/ndk-patches/27/linux-fcntl.h.patch b/ndk-patches/27b/linux-fcntl.h.patch similarity index 100% rename from ndk-patches/27/linux-fcntl.h.patch rename to ndk-patches/27b/linux-fcntl.h.patch diff --git a/ndk-patches/27/paths.h.patch b/ndk-patches/27b/paths.h.patch similarity index 100% rename from ndk-patches/27/paths.h.patch rename to ndk-patches/27b/paths.h.patch diff --git a/ndk-patches/27/pwd.h.patch b/ndk-patches/27b/pwd.h.patch similarity index 100% rename from ndk-patches/27/pwd.h.patch rename to ndk-patches/27b/pwd.h.patch diff --git a/ndk-patches/27/redefine-TCSAFLUSH.patch b/ndk-patches/27b/redefine-TCSAFLUSH.patch similarity index 100% rename from ndk-patches/27/redefine-TCSAFLUSH.patch rename to ndk-patches/27b/redefine-TCSAFLUSH.patch diff --git a/ndk-patches/27/semaphore.h.patch b/ndk-patches/27b/semaphore.h.patch similarity index 100% rename from ndk-patches/27/semaphore.h.patch rename to ndk-patches/27b/semaphore.h.patch diff --git a/ndk-patches/27/stdio.h.patch b/ndk-patches/27b/stdio.h.patch similarity index 100% rename from ndk-patches/27/stdio.h.patch rename to ndk-patches/27b/stdio.h.patch diff --git a/ndk-patches/27/stdlib.h.patch b/ndk-patches/27b/stdlib.h.patch similarity index 100% rename from ndk-patches/27/stdlib.h.patch rename to ndk-patches/27b/stdlib.h.patch diff --git a/ndk-patches/27/sys-cdefs.h.patch b/ndk-patches/27b/sys-cdefs.h.patch similarity index 100% rename from ndk-patches/27/sys-cdefs.h.patch rename to ndk-patches/27b/sys-cdefs.h.patch diff --git a/ndk-patches/27/sys-time.h.patch b/ndk-patches/27b/sys-time.h.patch similarity index 100% rename from ndk-patches/27/sys-time.h.patch rename to ndk-patches/27b/sys-time.h.patch diff --git a/ndk-patches/27/syslog.patch b/ndk-patches/27b/syslog.patch similarity index 100% rename from ndk-patches/27/syslog.patch rename to ndk-patches/27b/syslog.patch diff --git a/ndk-patches/27/time.h.patch b/ndk-patches/27b/time.h.patch similarity index 100% rename from ndk-patches/27/time.h.patch rename to ndk-patches/27b/time.h.patch diff --git a/ndk-patches/27/unistd.h.patch b/ndk-patches/27b/unistd.h.patch similarity index 100% rename from ndk-patches/27/unistd.h.patch rename to ndk-patches/27b/unistd.h.patch diff --git a/ndk-patches/27/utmp.h.patch b/ndk-patches/27b/utmp.h.patch similarity index 100% rename from ndk-patches/27/utmp.h.patch rename to ndk-patches/27b/utmp.h.patch diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 6d1301b7487230a..2cb1fcfdd6434de 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -6,9 +6,9 @@ termux_step_setup_toolchain() { # Bump TERMUX_STANDALONE_TOOLCHAIN if a change is made in # toolchain setup to ensure that everyone gets an updated # toolchain - if [ "${TERMUX_NDK_VERSION}" = "27" ]; then + if [ "${TERMUX_NDK_VERSION}" = "27b" ]; then TERMUX_STANDALONE_TOOLCHAIN+="-v1" - termux_setup_toolchain_27 + termux_setup_toolchain_27b elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then TERMUX_STANDALONE_TOOLCHAIN+="-v8" termux_setup_toolchain_23c diff --git a/scripts/build/toolchain/termux_setup_toolchain_27.sh b/scripts/build/toolchain/termux_setup_toolchain_27b.sh similarity index 99% rename from scripts/build/toolchain/termux_setup_toolchain_27.sh rename to scripts/build/toolchain/termux_setup_toolchain_27b.sh index 0b76504d1f7a746..ba261e17208cac7 100644 --- a/scripts/build/toolchain/termux_setup_toolchain_27.sh +++ b/scripts/build/toolchain/termux_setup_toolchain_27b.sh @@ -1,4 +1,4 @@ -termux_setup_toolchain_27() { +termux_setup_toolchain_27b() { export CFLAGS="" export CPPFLAGS="" export LDFLAGS="-L${TERMUX_PREFIX}/lib" diff --git a/scripts/properties.sh b/scripts/properties.sh index 03b87e35fd29694..bc8b1e9bc976bda 100644 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -10,7 +10,7 @@ TERMUX_ANDROID_BUILD_TOOLS_VERSION=33.0.1 # apksigner, d8 # and trigger rebuild of them : "${TERMUX_NDK_VERSION_NUM:="27"}" -: "${TERMUX_NDK_REVISION:=""}" +: "${TERMUX_NDK_REVISION:="b"}" TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION # when changing the above: # update version and hashsum in packages diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh index 0b207e87643088a..99f32f7026b0725 100755 --- a/scripts/setup-android-sdk.sh +++ b/scripts/setup-android-sdk.sh @@ -10,9 +10,9 @@ set -e -u ANDROID_SDK_FILE=commandlinetools-linux-${TERMUX_SDK_REVISION}_latest.zip ANDROID_SDK_SHA256=0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a -if [ "$TERMUX_NDK_VERSION" = "27" ]; then +if [ "$TERMUX_NDK_VERSION" = "27b" ]; then ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip - ANDROID_NDK_SHA256=2f17eb8bcbfdc40201c0b36e9a70826fcd2524ab7a2a235e2c71186c302da1dc + ANDROID_NDK_SHA256=33e16af1a6bbabe12cad54b2117085c07eab7e4fa67cdd831805f0e94fd826c1 elif [ "$TERMUX_NDK_VERSION" = 23c ]; then ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip ANDROID_NDK_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242