bump(main/ndk-sysroot): bump to 27

termux · Jul 22, 2024 · 5e1785d · 5e1785d
1 parent ab6957f
commit 5e1785d
Showing 1 changed file with 20 additions and 5 deletions.
diff --git 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=26b
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_VERSION=27
 TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
-TERMUX_PKG_SHA256=ad73c0370f0b0a87d1671ed2fd5a9ac9acfd1eb5c43a7fbfbd330f85d19dd632
+TERMUX_PKG_SHA256=2f17eb8bcbfdc40201c0b36e9a70826fcd2524ab7a2a235e2c71186c302da1dc
 TERMUX_PKG_AUTO_UPDATE=false
 # This package has taken over <pty.h> from the previous libutil-dev
 # and iconv.h from libandroid-support-dev:
@@ -34,6 +33,22 @@ include/zconf.h
 include/zlib.h
 "
 
+termux_step_get_source() {
+	mkdir -p "$TERMUX_PKG_SRCDIR"
+	if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
+		termux_download_src_archive
+		cd $TERMUX_PKG_TMPDIR
+		termux_extract_src_archive
+	else
+		local lib_path="toolchains/llvm/prebuilt/linux-x86_64/sysroot"
+		mkdir -p "$TERMUX_PKG_SRCDIR"/"$lib_path"
+		cp -fr "$NDK"/"$lib_path"/* "$TERMUX_PKG_SRCDIR"/"$lib_path"/
+		lib_path="toolchains/llvm/prebuilt/linux-x86_64/lib"
+		mkdir -p "$TERMUX_PKG_SRCDIR"/"$lib_path"
+		cp -fr "$NDK"/"$lib_path"/* "$TERMUX_PKG_SRCDIR"/"$lib_path"/
+	fi
+}
+
 termux_step_post_get_source() {
 	pushd toolchains/llvm/prebuilt/linux-x86_64/sysroot/
 	for patch in $TERMUX_SCRIPTDIR/ndk-patches/$TERMUX_PKG_VERSION/*.patch; do
@@ -74,9 +89,9 @@ termux_step_make_install() {
 	test $NDK_ARCH == 'i686' && NDK_ARCH='i386'
 
 	# clang 13 requires libunwind on Android.
-	cp toolchains/llvm/prebuilt/linux-x86_64/lib/clang/17/lib/linux/$NDK_ARCH/libatomic.a \
+	cp toolchains/llvm/prebuilt/linux-x86_64/lib/clang/18/lib/linux/$NDK_ARCH/libatomic.a \
 		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
-	cp toolchains/llvm/prebuilt/linux-x86_64/lib/clang/17/lib/linux/$NDK_ARCH/libunwind.a \
+	cp toolchains/llvm/prebuilt/linux-x86_64/lib/clang/18/lib/linux/$NDK_ARCH/libunwind.a \
 		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
 
 	# librt and libpthread are built into libc on android, so setup them as symlinks