From 085d6bded55ba2d29d2a0fcbde9a82ec85de30d4 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Mon, 21 Oct 2024 22:58:45 +0800 Subject: [PATCH 1/3] scripts(toolchain): update to ndk r27c --- build-package.sh | 4 ++-- ndk-patches/{27b => 27c}/bits-struct_file.h.patch | 0 ndk-patches/{27b => 27c}/dirent.h.patch | 0 ndk-patches/{27b => 27c}/grp.h.patch | 0 ndk-patches/{27b => 27c}/linux-fcntl.h.patch | 0 ndk-patches/{27b => 27c}/paths.h.patch | 0 ndk-patches/{27b => 27c}/pwd.h.patch | 0 ndk-patches/{27b => 27c}/redefine-TCSAFLUSH.patch | 0 ndk-patches/{27b => 27c}/semaphore.h.patch | 0 ndk-patches/{27b => 27c}/stdio.h.patch | 0 ndk-patches/{27b => 27c}/stdlib.h.patch | 0 ndk-patches/{27b => 27c}/sys-cdefs.h.patch | 0 ndk-patches/{27b => 27c}/sys-time.h.patch | 0 ndk-patches/{27b => 27c}/syslog.patch | 0 ndk-patches/{27b => 27c}/time.h.patch | 0 ndk-patches/{27b => 27c}/unistd.h.patch | 0 ndk-patches/{27b => 27c}/utmp.h.patch | 0 scripts/build/termux_step_setup_toolchain.sh | 4 ++-- ...x_setup_toolchain_27b.sh => termux_setup_toolchain_27c.sh} | 2 +- scripts/properties.sh | 2 +- scripts/setup-android-sdk.sh | 4 ++-- 21 files changed, 8 insertions(+), 8 deletions(-) rename ndk-patches/{27b => 27c}/bits-struct_file.h.patch (100%) rename ndk-patches/{27b => 27c}/dirent.h.patch (100%) rename ndk-patches/{27b => 27c}/grp.h.patch (100%) rename ndk-patches/{27b => 27c}/linux-fcntl.h.patch (100%) rename ndk-patches/{27b => 27c}/paths.h.patch (100%) rename ndk-patches/{27b => 27c}/pwd.h.patch (100%) rename ndk-patches/{27b => 27c}/redefine-TCSAFLUSH.patch (100%) rename ndk-patches/{27b => 27c}/semaphore.h.patch (100%) rename ndk-patches/{27b => 27c}/stdio.h.patch (100%) rename ndk-patches/{27b => 27c}/stdlib.h.patch (100%) rename ndk-patches/{27b => 27c}/sys-cdefs.h.patch (100%) rename ndk-patches/{27b => 27c}/sys-time.h.patch (100%) rename ndk-patches/{27b => 27c}/syslog.patch (100%) rename ndk-patches/{27b => 27c}/time.h.patch (100%) rename ndk-patches/{27b => 27c}/unistd.h.patch (100%) rename ndk-patches/{27b => 27c}/utmp.h.patch (100%) rename scripts/build/toolchain/{termux_setup_toolchain_27b.sh => termux_setup_toolchain_27c.sh} (99%) diff --git a/build-package.sh b/build-package.sh index 7912385750f0f7..57ef32fffb86cd 100755 --- a/build-package.sh +++ b/build-package.sh @@ -241,8 +241,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_27b.sh -source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_27b.sh" +# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_27c.sh +source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_27c.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/27b/bits-struct_file.h.patch b/ndk-patches/27c/bits-struct_file.h.patch similarity index 100% rename from ndk-patches/27b/bits-struct_file.h.patch rename to ndk-patches/27c/bits-struct_file.h.patch diff --git a/ndk-patches/27b/dirent.h.patch b/ndk-patches/27c/dirent.h.patch similarity index 100% rename from ndk-patches/27b/dirent.h.patch rename to ndk-patches/27c/dirent.h.patch diff --git a/ndk-patches/27b/grp.h.patch b/ndk-patches/27c/grp.h.patch similarity index 100% rename from ndk-patches/27b/grp.h.patch rename to ndk-patches/27c/grp.h.patch diff --git a/ndk-patches/27b/linux-fcntl.h.patch b/ndk-patches/27c/linux-fcntl.h.patch similarity index 100% rename from ndk-patches/27b/linux-fcntl.h.patch rename to ndk-patches/27c/linux-fcntl.h.patch diff --git a/ndk-patches/27b/paths.h.patch b/ndk-patches/27c/paths.h.patch similarity index 100% rename from ndk-patches/27b/paths.h.patch rename to ndk-patches/27c/paths.h.patch diff --git a/ndk-patches/27b/pwd.h.patch b/ndk-patches/27c/pwd.h.patch similarity index 100% rename from ndk-patches/27b/pwd.h.patch rename to ndk-patches/27c/pwd.h.patch diff --git a/ndk-patches/27b/redefine-TCSAFLUSH.patch b/ndk-patches/27c/redefine-TCSAFLUSH.patch similarity index 100% rename from ndk-patches/27b/redefine-TCSAFLUSH.patch rename to ndk-patches/27c/redefine-TCSAFLUSH.patch diff --git a/ndk-patches/27b/semaphore.h.patch b/ndk-patches/27c/semaphore.h.patch similarity index 100% rename from ndk-patches/27b/semaphore.h.patch rename to ndk-patches/27c/semaphore.h.patch diff --git a/ndk-patches/27b/stdio.h.patch b/ndk-patches/27c/stdio.h.patch similarity index 100% rename from ndk-patches/27b/stdio.h.patch rename to ndk-patches/27c/stdio.h.patch diff --git a/ndk-patches/27b/stdlib.h.patch b/ndk-patches/27c/stdlib.h.patch similarity index 100% rename from ndk-patches/27b/stdlib.h.patch rename to ndk-patches/27c/stdlib.h.patch diff --git a/ndk-patches/27b/sys-cdefs.h.patch b/ndk-patches/27c/sys-cdefs.h.patch similarity index 100% rename from ndk-patches/27b/sys-cdefs.h.patch rename to ndk-patches/27c/sys-cdefs.h.patch diff --git a/ndk-patches/27b/sys-time.h.patch b/ndk-patches/27c/sys-time.h.patch similarity index 100% rename from ndk-patches/27b/sys-time.h.patch rename to ndk-patches/27c/sys-time.h.patch diff --git a/ndk-patches/27b/syslog.patch b/ndk-patches/27c/syslog.patch similarity index 100% rename from ndk-patches/27b/syslog.patch rename to ndk-patches/27c/syslog.patch diff --git a/ndk-patches/27b/time.h.patch b/ndk-patches/27c/time.h.patch similarity index 100% rename from ndk-patches/27b/time.h.patch rename to ndk-patches/27c/time.h.patch diff --git a/ndk-patches/27b/unistd.h.patch b/ndk-patches/27c/unistd.h.patch similarity index 100% rename from ndk-patches/27b/unistd.h.patch rename to ndk-patches/27c/unistd.h.patch diff --git a/ndk-patches/27b/utmp.h.patch b/ndk-patches/27c/utmp.h.patch similarity index 100% rename from ndk-patches/27b/utmp.h.patch rename to ndk-patches/27c/utmp.h.patch diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 2cb1fcfdd6434d..5a636750e0d9bf 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}" = "27b" ]; then + if [ "${TERMUX_NDK_VERSION}" = "27c" ]; then TERMUX_STANDALONE_TOOLCHAIN+="-v1" - termux_setup_toolchain_27b + termux_setup_toolchain_27c elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then TERMUX_STANDALONE_TOOLCHAIN+="-v8" termux_setup_toolchain_23c diff --git a/scripts/build/toolchain/termux_setup_toolchain_27b.sh b/scripts/build/toolchain/termux_setup_toolchain_27c.sh similarity index 99% rename from scripts/build/toolchain/termux_setup_toolchain_27b.sh rename to scripts/build/toolchain/termux_setup_toolchain_27c.sh index ba261e17208cac..f9c36559e97977 100644 --- a/scripts/build/toolchain/termux_setup_toolchain_27b.sh +++ b/scripts/build/toolchain/termux_setup_toolchain_27c.sh @@ -1,4 +1,4 @@ -termux_setup_toolchain_27b() { +termux_setup_toolchain_27c() { export CFLAGS="" export CPPFLAGS="" export LDFLAGS="-L${TERMUX_PREFIX}/lib" diff --git a/scripts/properties.sh b/scripts/properties.sh index bc8b1e9bc976bd..69e27486c2fee4 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:="b"}" +: "${TERMUX_NDK_REVISION:="c"}" 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 b8f5c09d78fbcc..827e982b0a5688 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" = "27b" ]; then +if [ "$TERMUX_NDK_VERSION" = "27c" ]; then ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip - ANDROID_NDK_SHA256=33e16af1a6bbabe12cad54b2117085c07eab7e4fa67cdd831805f0e94fd826c1 + ANDROID_NDK_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc elif [ "$TERMUX_NDK_VERSION" = 23c ]; then ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip ANDROID_NDK_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242 From 0a610a350264e27670e1d3929ee46a9d64f69cdd Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Mon, 21 Oct 2024 22:59:07 +0800 Subject: [PATCH 2/3] bump(main): ndk based packages to 27c --- packages/libandroid-stub/build.sh | 4 ++-- packages/libc++/build.sh | 4 ++-- packages/ndk-multilib/build.sh | 4 ++-- packages/ndk-sysroot/build.sh | 4 ++-- packages/vulkan-loader-android/build.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/libandroid-stub/build.sh b/packages/libandroid-stub/build.sh index f65560761b2ddf..f4245e57284250 100644 --- a/packages/libandroid-stub/build.sh +++ b/packages/libandroid-stub/build.sh @@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" # Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in # scripts/properties.sh -TERMUX_PKG_VERSION=27b +TERMUX_PKG_VERSION=27c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=33e16af1a6bbabe12cad54b2117085c07eab7e4fa67cdd831805f0e94fd826c1 +TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_CONFLICTS="libandroid" TERMUX_PKG_REPLACES="libandroid" diff --git a/packages/libc++/build.sh b/packages/libc++/build.sh index 3cf68ddcac0d2d..a573e9439cd229 100644 --- a/packages/libc++/build.sh +++ b/packages/libc++/build.sh @@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" # Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in # scripts/properties.sh -TERMUX_PKG_VERSION=27b +TERMUX_PKG_VERSION=27c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=33e16af1a6bbabe12cad54b2117085c07eab7e4fa67cdd831805f0e94fd826c1 +TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_ESSENTIAL=true TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh index 16853069837f45..6a05ef24a38a15 100644 --- a/packages/ndk-multilib/build.sh +++ b/packages/ndk-multilib/build.sh @@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" # Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in # scripts/properties.sh -TERMUX_PKG_VERSION=27b +TERMUX_PKG_VERSION=27c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=33e16af1a6bbabe12cad54b2117085c07eab7e4fa67cdd831805f0e94fd826c1 +TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_NO_STATICSPLIT=true diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index e3054227e11f67..27a92c6f33f2a3 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" # Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in # scripts/properties.sh -TERMUX_PKG_VERSION=27b +TERMUX_PKG_VERSION=27c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=33e16af1a6bbabe12cad54b2117085c07eab7e4fa67cdd831805f0e94fd826c1 +TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc TERMUX_PKG_AUTO_UPDATE=false # This package has taken over from the previous libutil-dev # and iconv.h from libandroid-support-dev: diff --git a/packages/vulkan-loader-android/build.sh b/packages/vulkan-loader-android/build.sh index ba5261c6e3a4c1..564281f09129c3 100644 --- a/packages/vulkan-loader-android/build.sh +++ b/packages/vulkan-loader-android/build.sh @@ -4,9 +4,9 @@ TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" # Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in # scripts/properties.sh -TERMUX_PKG_VERSION=27b +TERMUX_PKG_VERSION=27c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=33e16af1a6bbabe12cad54b2117085c07eab7e4fa67cdd831805f0e94fd826c1 +TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_BUILD_IN_SRC=true From 1201515aa6a7135329bad4ea10a729f8501eddf9 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:13:13 +0800 Subject: [PATCH 3/3] scripts(flang-toolchain): bump to r27c --- scripts/build/setup/termux_setup_flang.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build/setup/termux_setup_flang.sh b/scripts/build/setup/termux_setup_flang.sh index 31b1b0bb9cedab..588fb7825517e4 100644 --- a/scripts/build/setup/termux_setup_flang.sh +++ b/scripts/build/setup/termux_setup_flang.sh @@ -19,13 +19,13 @@ termux_setup_flang() { local __cache_dir="$TERMUX_COMMON_CACHEDIR"/flang-toolchain-cache mkdir -p "$__cache_dir" - local __version="r27b" + local __version="r27c" local _flang_toolchain_version=0 local __sha256sums=" -811b70320c7fa46aa179dc6e7fa69ce2009844dbe8af40de4befe185ae348a87 package-flang-aarch64.tar.bz2 -9fe4d6d255d4294a97f59fa55f732f34e3b7dacfa6af0bfc949787055b1b0f47 package-flang-host.tar.bz2 -f5cca2f9cf0d736e108c490e90b30fd8dee34f53cbd6e442cdbcc34fdaa55527 package-flang-x86_64.tar.bz2 -4763f91d32b9be8df8f6695868ac71f7f4b85d3f99e43bafb186986718060442 package-install.tar.bz2 +775f362c758abe8d3173edc7be9ced3730ff14c64d44743017c3af7ceb0a6610 package-flang-aarch64.tar.bz2 +04fe24d67ee7eb5a4223299c610013585e75c56467e4b185ed929a3d17e3d077 package-flang-host.tar.bz2 +2061a0e3179f4afa55516ce3858582d25ea7b108ff762d9fb4ec8a03b49b36d2 package-flang-x86_64.tar.bz2 +d37dc6a58b495807f015c7fec08a57ff95d52ad0d0553cbf573b0215d8a1707c package-install.tar.bz2 " local __checksum local __file