From 0fda34c75b62ed11f95e5d12cc2f5d2815d05f26 Mon Sep 17 00:00:00 2001
From: termux-pacman-bot <termux-pacman-bot@outlook.com>
Date: Mon, 30 Jun 2025 00:51:34 +0000
Subject: [PATCH] Update repo

---
 scripts/properties.sh   |  3 +++
 scripts/setup-ubuntu.sh | 26 ++++++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/scripts/properties.sh b/scripts/properties.sh
index da0859acbe..b98c3a4690 100644
--- a/scripts/properties.sh
+++ b/scripts/properties.sh
@@ -314,6 +314,9 @@ TERMUX_NDK_VERSION="${TERMUX_NDK_VERSION_NUM}${TERMUX_NDK_REVISION}"
 # and update SHA256 sums in scripts/setup-android-sdk.sh
 # check all packages build and run correctly and bump if needed
 
+: "${TERMUX_HOST_LLVM_MAJOR_VERSION:="19"}"
+: "${TERMUX_HOST_LLVM_BASE_DIR:="/usr/lib/llvm-${TERMUX_HOST_LLVM_MAJOR_VERSION}"}"
+
 : "${TERMUX_JAVA_HOME:=/usr/lib/jvm/java-17-openjdk-amd64}"
 export JAVA_HOME="${TERMUX_JAVA_HOME}"
 
diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index c80d703af7..b10c571c48 100755
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -144,10 +144,7 @@ PACKAGES+=" php-xml"
 PACKAGES+=" composer"
 
 # Needed by package rust.
-PACKAGES+=" libssl-dev" # Needed to build Rust
-PACKAGES+=" llvm-19-dev"
-PACKAGES+=" llvm-19-tools"
-PACKAGES+=" clang-19"
+PACKAGES+=" libssl-dev"
 
 # Needed by librusty-v8
 PACKAGES+=" libclang-rt-17-dev"
@@ -331,23 +328,36 @@ fi
 # Allow 32-bit packages.
 $SUDO dpkg --add-architecture i386
 
+$SUDO apt-get -yq update
+
+# Install jq first, then source properties.sh
+$SUDO env DEBIAN_FRONTEND=noninteractive \
+	apt-get install -yq --no-install-recommends $PACKAGES
+
+. $(dirname "$(realpath "$0")")/properties.sh
+
+LLVM_PACKAGES=""
+
+# Needed by rust and other packages.
+LLVM_PACKAGES+=" llvm-${TERMUX_HOST_LLVM_MAJOR_VERSION}-dev"
+LLVM_PACKAGES+=" llvm-${TERMUX_HOST_LLVM_MAJOR_VERSION}-tools"
+LLVM_PACKAGES+=" clang-${TERMUX_HOST_LLVM_MAJOR_VERSION}"
+
 # Add apt.llvm.org repo to get newer LLVM than Ubuntu provided
 $SUDO cp $(dirname "$(realpath "$0")")/llvm-snapshot.gpg.key /etc/apt/trusted.gpg.d/apt.llvm.org.asc
 $SUDO chmod a+r /etc/apt/trusted.gpg.d/apt.llvm.org.asc
 {
-	echo "deb [arch=amd64] http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
+	echo "deb [arch=amd64] http://apt.llvm.org/noble/ llvm-toolchain-noble-${TERMUX_HOST_LLVM_MAJOR_VERSION} main"
 } | $SUDO tee /etc/apt/sources.list.d/apt-llvm-org.list > /dev/null
 
 $SUDO apt-get -yq update
 
 $SUDO env DEBIAN_FRONTEND=noninteractive \
-	apt-get install -yq --no-install-recommends $PACKAGES
+	apt-get install -yq --no-install-recommends $LLVM_PACKAGES
 
 $SUDO locale-gen --purge en_US.UTF-8
 echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' | $SUDO tee -a /etc/default/locale
 
-. $(dirname "$(realpath "$0")")/properties.sh
-
 # Ownership of `TERMUX__PREFIX` must be fixed before `TERMUX_APP__DATA_DIR`
 # if its under it, otherwise `TERMUX__ROOTFS` will not have its ownership fixed.
 $SUDO mkdir -p "$TERMUX__PREFIX"