Patch package to extract from r23c

truboxl · Jun 21, 2024 · 41d70d7 · 41d70d7
1 parent 9947fdc
commit 41d70d7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/build-package.sh b/build-package.sh
@@ -16,8 +16,19 @@ arm-vfpv3-d16)
 	TERMUX_ARCH=arm
 	TERMUX_NDK_VERSION_NUM=23
 	TERMUX_NDK_REVISION=c
+	# Special packages that extract libs from Android NDK that
+	# are built without NEON but the version label is kept
+	# higher to avoid build issues from other packages
+	local p
+	for p in libandroid-stub libc++ ndk-multilib ndk-sysroot vulkan-loader-android; do
+		sed \
+			-e "s|^TERMUX_PKG_SRCURL=.*|TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r23c-linux.zip|" \
+			-e "s|^TERMUX_PKG_SHA256=.*|TERMUX_PKG_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242|" \
+			-i "$REPOROOT/packages/$p/build.sh"
+	done
 	patch -p1 -i "$REPOROOT/termux-packages.$1.lf.patch"
 	#patch -p1 -i "$REPOROOT/termux-packages.$1.crlf.patch"
+
 	echo "[*] Setting up toolchain ..."
 	t0=$(cut -d'.' -f1 /proc/uptime)
 	./scripts/setup-ubuntu.sh &>/dev/null

diff --git a/generate-bootstraps.sh b/generate-bootstraps.sh
@@ -14,8 +14,19 @@ arm-vfpv3-d16)
 	TERMUX_ARCH=arm
 	TERMUX_NDK_VERSION_NUM=23
 	TERMUX_NDK_REVISION=c
+	# Special packages that extract libs from Android NDK that
+	# are built without NEON but the version label is kept
+	# higher to avoid build issues from other packages
+	local p
+	for p in libandroid-stub libc++ ndk-multilib ndk-sysroot vulkan-loader-android; do
+		sed \
+			-e "s|^TERMUX_PKG_SRCURL=.*|TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r23c-linux.zip|" \
+			-e "s|^TERMUX_PKG_SHA256=.*|TERMUX_PKG_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242|" \
+			-i "$REPOROOT/packages/$p/build.sh"
+	done
 	patch -p1 -i "$REPOROOT/termux-packages.$1.lf.patch"
 	#patch -p1 -i "$REPOROOT/termux-packages.$1.crlf.patch"
+
 	# Temporarily add this until pull request is merged
 	cp -fv "$REPOROOT/generate-bootstraps-patch.sh" scripts/generate-bootstraps.sh
 	# Should not need to mkdir "$REPOROOT/output" if build-package.sh worked