From 268452c314bdc99f49efc8923b302acf8c481ab3 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Sun, 11 Sep 2022 23:30:20 +0800 Subject: [PATCH] scripts: update to ndk r25b --- build-package.sh | 6 +++--- ndk-patches/{25 => 25b} | 0 scripts/build/termux_step_setup_toolchain.sh | 6 +++--- ...p_toolchain_25.sh => termux_setup_toolchain_25b.sh} | 10 +++++++++- scripts/properties.sh | 2 +- scripts/setup-android-sdk.sh | 4 ++-- 6 files changed, 18 insertions(+), 10 deletions(-) rename ndk-patches/{25 => 25b} (100%) rename scripts/build/toolchain/{termux_setup_toolchain_25.sh => termux_setup_toolchain_25b.sh} (95%) diff --git a/build-package.sh b/build-package.sh index ec64e49ddd..ba90028704 100755 --- a/build-package.sh +++ b/build-package.sh @@ -189,9 +189,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 25 toolchain. Called from termux_step_setup_toolchain. -# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_25.sh -source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_25.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 23c toolchain. Called from termux_step_setup_toolchain. # shellcheck source=scripts/build/toolchain/termux_setup_toolchain_23c.sh diff --git a/ndk-patches/25 b/ndk-patches/25b similarity index 100% rename from ndk-patches/25 rename to ndk-patches/25b diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index f64461e85e..07b53a9a83 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}" = 25 ]; then - TERMUX_STANDALONE_TOOLCHAIN+="-v1" - termux_setup_toolchain_25 + if [ "${TERMUX_NDK_VERSION}" = 25b ]; then + TERMUX_STANDALONE_TOOLCHAIN+="-v0" + termux_setup_toolchain_25b elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then TERMUX_STANDALONE_TOOLCHAIN+="-v2" termux_setup_toolchain_23c diff --git a/scripts/build/toolchain/termux_setup_toolchain_25.sh b/scripts/build/toolchain/termux_setup_toolchain_25b.sh similarity index 95% rename from scripts/build/toolchain/termux_setup_toolchain_25.sh rename to scripts/build/toolchain/termux_setup_toolchain_25b.sh index 5befae1331..bb8f7207da 100644 --- a/scripts/build/toolchain/termux_setup_toolchain_25.sh +++ b/scripts/build/toolchain/termux_setup_toolchain_25b.sh @@ -1,10 +1,11 @@ -termux_setup_toolchain_25() { +termux_setup_toolchain_25b() { export CFLAGS="" export CPPFLAGS="" export LDFLAGS="-L${TERMUX_PREFIX}/lib" export AS=$TERMUX_HOST_PLATFORM-clang export CC=$TERMUX_HOST_PLATFORM-clang + export CPP=$TERMUX_HOST_PLATFORM-cpp export CXX=$TERMUX_HOST_PLATFORM-clang++ export LD=ld.lld export AR=llvm-ar @@ -145,6 +146,11 @@ termux_setup_toolchain_25() { cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang++ \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang++ + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-cpp + sed -i 's|"$bin_dir/clang"|& -E|' \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-cpp + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-gcc cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang++ \ @@ -155,6 +161,8 @@ termux_setup_toolchain_25() { $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL-clang++ \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang++ + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi-cpp \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-cpp # Create a pkg-config wrapper. We use path to host pkg-config to # avoid picking up a cross-compiled pkg-config later on. diff --git a/scripts/properties.sh b/scripts/properties.sh index f2842b7bd4..0471006c31 100644 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -6,7 +6,7 @@ TERMUX_SDK_REVISION=8512546 TERMUX_ANDROID_BUILD_TOOLS_VERSION=30.0.3 : "${TERMUX_NDK_VERSION_NUM:="25"}" -: "${TERMUX_NDK_REVISION:=""}" +: "${TERMUX_NDK_REVISION:="b"}" TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION # when changing the above: # remove TERMUX_PKG_REVISION in: diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh index 83e4aeabfa..d597fe4296 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=2ccbda4302db862a28ada25aa7425d99dce9462046003c1714b059b5c47970d8 -if [ "$TERMUX_NDK_VERSION" = 25 ]; then +if [ "$TERMUX_NDK_VERSION" = 25b ]; then ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip - ANDROID_NDK_SHA256=cd661aeda5d9b7cfb6e64bd80737c274d7c1c0d026df2f85be3bf3327b25e545 + ANDROID_NDK_SHA256=403ac3e3020dd0db63a848dcaba6ceb2603bf64de90949d5c4361f848e44b005 elif [ "$TERMUX_NDK_VERSION" = 23c ]; then ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip ANDROID_NDK_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242