From 2f3ee44526c03b9c4920cae23241a9fa4962a043 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Sun, 23 Jun 2024 17:08:26 +0000
Subject: [PATCH] Update repo

---
 .../build/get_source/termux_git_clone_src.sh  | 22 ++++++++++++++++++-
 scripts/build/setup/termux_setup_rust.sh      | 10 ++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/scripts/build/get_source/termux_git_clone_src.sh b/scripts/build/get_source/termux_git_clone_src.sh
index 1cb37675a0..7f310da61b 100644
--- a/scripts/build/get_source/termux_git_clone_src.sh
+++ b/scripts/build/get_source/termux_git_clone_src.sh
@@ -14,7 +14,27 @@ termux_git_clone_src() {
 			$TMP_CHECKOUT
 
 		pushd $TMP_CHECKOUT
-		git submodule update --init --recursive --depth=1
+
+		# Workaround some bad server behaviour
+		# error: Server does not allow request for unadvertised object commit_no
+		# fatal: Fetched in submodule 'submodule_path', but it did not contain commit_no. Direct fetching of that commit failed.
+		if ! git submodule update --init --recursive --depth=1; then
+			local depth=10
+			local maxdepth=100
+			sleep 1
+			while :; do
+				echo "WARN: Retrying with max depth $depth"
+				if git submodule update --init --recursive --depth=$depth; then
+					break
+				fi
+				if [[ "$depth" -gt "$maxdepth" ]]; then
+					termux_error_exit "Failed to clone submodule"
+				fi
+				depth=$((depth+10))
+				sleep 1
+			done
+		fi
+
 		popd
 
 		echo "$TERMUX_PKG_VERSION" > $TMP_CHECKOUT_VERSION
diff --git a/scripts/build/setup/termux_setup_rust.sh b/scripts/build/setup/termux_setup_rust.sh
index 695ebfd835..99f9a1a2df 100644
--- a/scripts/build/setup/termux_setup_rust.sh
+++ b/scripts/build/setup/termux_setup_rust.sh
@@ -36,13 +36,13 @@ termux_setup_rust() {
 
 	local ENV_NAME=CARGO_TARGET_${CARGO_TARGET_NAME^^}_LINKER
 	ENV_NAME=${ENV_NAME//-/_}
-	export $ENV_NAME="${CC}"
+	export $ENV_NAME="${CC:-}"
 	# TARGET_CFLAGS and CFLAGS incorrectly applied globally
 	# for host build and other targets so set them individually
-	export CFLAGS_aarch64_linux_android="${CPPFLAGS}"
-	export CFLAGS_armv7_linux_androideabi="${CPPFLAGS}"
-	export CFLAGS_i686_linux_android="${CPPFLAGS}"
-	export CFLAGS_x86_64_linux_android="${CPPFLAGS}"
+	export CFLAGS_aarch64_linux_android="${CPPFLAGS:-}"
+	export CFLAGS_armv7_linux_androideabi="${CPPFLAGS:-}"
+	export CFLAGS_i686_linux_android="${CPPFLAGS:-}"
+	export CFLAGS_x86_64_linux_android="${CPPFLAGS:-}"
 	unset CFLAGS
 
 	if [[ -z "${TERMUX_RUST_VERSION-}" ]]; then