Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

toolchain: bump to r27c #21920

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

toolchain: bump to r27c #21920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
085d6bd
scripts(toolchain): update to ndk r27c
licy183 Oct 21, 2024
0a610a3
bump(main): ndk based packages to 27c
licy183 Oct 21, 2024
1201515
scripts(flang-toolchain): bump to r27c
licy183 Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ndk-patches/27b/bits-struct_file.h.patch → ndk-patches/27c/bits-struct_file.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/dirent.h.patch → ndk-patches/27c/dirent.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/grp.h.patch → ndk-patches/27c/grp.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/linux-fcntl.h.patch → ndk-patches/27c/linux-fcntl.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/paths.h.patch → ndk-patches/27c/paths.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/pwd.h.patch → ndk-patches/27c/pwd.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/redefine-TCSAFLUSH.patch → ndk-patches/27c/redefine-TCSAFLUSH.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/semaphore.h.patch → ndk-patches/27c/semaphore.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/stdio.h.patch → ndk-patches/27c/stdio.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/stdlib.h.patch → ndk-patches/27c/stdlib.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/sys-cdefs.h.patch → ndk-patches/27c/sys-cdefs.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/sys-time.h.patch → ndk-patches/27c/sys-time.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/syslog.patch → ndk-patches/27c/syslog.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/time.h.patch → ndk-patches/27c/time.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/unistd.h.patch → ndk-patches/27c/unistd.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27b/utmp.h.patch → ndk-patches/27c/utmp.h.patch
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/libandroid-stub/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/libc++/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/ndk-multilib/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/ndk-sysroot/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <pty.h> from the previous libutil-dev
# and iconv.h from libandroid-support-dev:
Expand Down
4 changes: 2 additions & 2 deletions packages/vulkan-loader-android/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions scripts/build/setup/termux_setup_flang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/termux_step_setup_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...d/toolchain/termux_setup_toolchain_27b.sh → ...d/toolchain/termux_setup_toolchain_27c.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
termux_setup_toolchain_27b() {
termux_setup_toolchain_27c() {
export CFLAGS=""
export CPPFLAGS=""
export LDFLAGS="-L${TERMUX_PREFIX}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/properties.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup-android-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down