diff --git a/build-package.sh b/build-package.sh index 5e2e6b042c..1ab236a0cd 100755 --- a/build-package.sh +++ b/build-package.sh @@ -215,9 +215,9 @@ source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_handle_hostbuild.sh" # shellcheck source=scripts/build/termux_step_host_build.sh source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_host_build.sh" -# Setup a standalone Android NDK 25b toolchain. Called from termux_step_setup_toolchain. -# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_25b.sh -source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_25b.sh" +# Setup a standalone Android NDK 25c toolchain. Called from termux_step_setup_toolchain. +# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_25c.sh +source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_25c.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/25b b/ndk-patches/25c similarity index 100% rename from ndk-patches/25b rename to ndk-patches/25c diff --git a/packages/libc++/build.sh b/packages/libc++/build.sh index bae5074728..66ee2a8682 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=25b +TERMUX_PKG_VERSION=25c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005 +TERMUX_PKG_SHA256=769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 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 72952f3280..3d0ebc0326 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=25b +TERMUX_PKG_VERSION=25c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005 +TERMUX_PKG_SHA256=769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index 347f5e10a6..ae0e7b7571 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -4,10 +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=25b -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=25c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005 +TERMUX_PKG_SHA256=769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 # This package has taken over from the previous libutil-dev # and iconv.h from libandroid-support-dev: TERMUX_PKG_CONFLICTS="libutil-dev, libgcc, libandroid-support-dev" @@ -87,7 +86,7 @@ termux_step_make_install() { mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib # clang 13 requires libunwind on Android. - cp toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/14.0.6/lib/linux/$NDK_ARCH/libunwind.a \ + cp toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/14.0.7/lib/linux/$NDK_ARCH/libunwind.a \ $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib for lib in librt.so libpthread.so libutil.so; do echo 'INPUT(-lc)' > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/$lib diff --git a/packages/vulkan-loader-android/build.sh b/packages/vulkan-loader-android/build.sh index ba01e2b9a9..c5e1ae3441 100644 --- a/packages/vulkan-loader-android/build.sh +++ b/packages/vulkan-loader-android/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://source.android.com/devices/graphics/arch-vulkan TERMUX_PKG_DESCRIPTION="Vulkan Loader for Android" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=25b +TERMUX_PKG_VERSION=25c TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip -TERMUX_PKG_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005 +TERMUX_PKG_SHA256=769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_BUILD_IN_SRC=true diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 21bfc5b7b3..228cec2d2a 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -5,9 +5,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}" = 25b ]; then - TERMUX_STANDALONE_TOOLCHAIN+="-v3" - termux_setup_toolchain_25b + if [ "${TERMUX_NDK_VERSION}" = 25c ]; then + TERMUX_STANDALONE_TOOLCHAIN+="-v0" + termux_setup_toolchain_25c elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then TERMUX_STANDALONE_TOOLCHAIN+="-v3" termux_setup_toolchain_23c diff --git a/scripts/build/toolchain/termux_setup_toolchain_25b.sh b/scripts/build/toolchain/termux_setup_toolchain_25c.sh similarity index 99% rename from scripts/build/toolchain/termux_setup_toolchain_25b.sh rename to scripts/build/toolchain/termux_setup_toolchain_25c.sh index d2f653ebb5..2d3bfb6dc5 100644 --- a/scripts/build/toolchain/termux_setup_toolchain_25b.sh +++ b/scripts/build/toolchain/termux_setup_toolchain_25c.sh @@ -1,4 +1,4 @@ -termux_setup_toolchain_25b() { +termux_setup_toolchain_25c() { export CFLAGS="" export CPPFLAGS="" export LDFLAGS="-L${TERMUX_PREFIX}/lib" diff --git a/scripts/properties.sh b/scripts/properties.sh index 20417256eb..2ec62551bc 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:="25"}" -: "${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 6f54eb7ad7..7bb6359971 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" = 25b ]; then +if [ "$TERMUX_NDK_VERSION" = 25c ]; then ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip - ANDROID_NDK_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005 + ANDROID_NDK_SHA256=769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108 elif [ "$TERMUX_NDK_VERSION" = 23c ]; then ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip ANDROID_NDK_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242