rmpkg(main/binutils-is-llvm): make LLVM binutils default in Termux

robertkirkman · robertkirkman · commit 3d2d815b9dd7 · 2026-02-22T05:51:41.000-06:00
- My idea of a different solution to: - #8191 - #9715 - #16588 - Reverts: - #10012 - #13045 - Make Termux behave more similarly to the LLVM-based desktop Linux distro, Chimera Linux - Preserve `as` name for GNU `as`, since `llvm-as` is not compatible with software expecting GNU `as`, and Chimera Linux also gives that name to GNU `as`: #11218 - Source code and runtime behavior of Chimera Linux observed to design this PR https://chimera-linux.org/ | Binutil | Chimera Linux | Vanilla Android | Termux Current | Termux This PR | |:----------- |:------------- |:----------------- |:-------------- |:-------------- | | `addr2line` | LLVM | `llvm-` name only | Variable | LLVM | | `ar` | LLVM | `llvm-` name only | Variable | LLVM | | `as` | GNU | `llvm-` name only | GNU | GNU | | `c++filt` | LLVM | `llvm-` name only | Variable | LLVM | | `elfedit` | LLVM | `llvm-` name only | Variable | LLVM | | `ld` | LLVM | LLVM | Variable | LLVM | | `nm` | LLVM | `llvm-` name only | Variable | LLVM | | `objcopy` | LLVM | `llvm-` name only | Variable | LLVM | | `objdump` | LLVM | `llvm-` name only | Variable | LLVM | | `prof` | LLVM | `llvm-` name only | Variable | LLVM | | `ranlib` | LLVM | `llvm-` name only | Variable | LLVM | | `readelf` | LLVM | `llvm-` name only | Variable | LLVM | | `size` | LLVM | `llvm-` name only | Variable | LLVM | | `strings` | LLVM | `llvm-` name only | Variable | LLVM | | `strip` | LLVM | `llvm-` name only | Variable | LLVM | - This is **not** a project to move Termux away from GNU in general. It is a project to make Termux have a consistent default implementation of a component that is among the group of components for which most distros pick a default and stick to it: | Component | GNU/Linux | Alpine Linux | Chimera Linux | FreeBSD | MacOS | Vanilla Android | Termux Current | Termux This PR | |:----------- |:--------- |:------------ |:------------- |:------- |:----- |:--------------- |:-------------- |:-------------- | | C stdlib | GNU | musl | musl | BSD | BSD | bionic | bionic | bionic | | C++ stdlib | GNU | GNU | LLVM | LLVM | LLVM | LLVM | LLVM | LLVM | | Compiler | GNU | GNU | LLVM | LLVM | LLVM | LLVM | LLVM | LLVM | | Binutils | GNU | GNU | LLVM | LLVM | LLVM | LLVM | **Variable** | LLVM | | Make | GNU | GNU | GNU | BSD | BSD | GNU | GNU | GNU | | Coreutils | GNU | busybox | BSD | BSD | BSD | toybox | GNU | GNU | most LLVM-based distros and operating systems choose the LLVM binutils, so choosing the LLVM binutils for Termux is reasonable and will contribute to the consistency of the wider LLVM-based distro ecosystem. - After #28438 , it is now impossible to have `binutils-is-llvm` and `ldd`, `binutils-bin` or `lua-language-server` installed simultaneously. - This disturbance to the prior status quo might inconvenience users of `ldd`, `lua-language-server`, `binutils-bin` or similar packages who are trying to build Termux packages on-device. - This is considered to have occurred due to the difficulty of maintaining multiple packages that provide binutils simultaneously, so the goal is now to reevaluate the default binutils executables provided in Termux, and make changes that solve the problem without reverting #28438 while aligning Termux more closely with the current choices used by an LLVM-based desktop Linux distro that also provides a GNU binutils package, Chimera Linux. After this, it will unfortunately be more difficult to compile certain software in Termux. Here is one example that I know of: ```bash git clone https://github.com/paullouisageneau/libjuice.git cd libjuice make ``` It would work before this PR if `binutils` was installed, but after this PR, it will show this error: ``` ar: error: unknown option f ``` (yes, this error also happens when building libjuice in Chimera Linux) Before this PR, it could be worked around by using `pkg install binutils`, but after this PR, it will only be possible to work around by either changing the invocation of `ar` to `gar` or removing the argument `f` from the instance of call to `ar` in `Makefile`. However: - it is already more difficult to compile software in Termux that has problems with Clang but not GCC, or problems with libc++ but not libstdc++, or problems with alternative libc but not glibc, and the additional limitation imposed by defaulting to LLVM binutils is expected to be relatively minimal - libjuice is not an official Termux package, and if it were, it would have already had to be patched to avoid this error anyway, because Termux currently has `ar` set to `llvm-ar` for building in multiple places: https://github.com/termux/termux-packages/blob/eaad7e0549ccf2fc3aa4919dc15b8306ce61dffc/scripts/build/toolchain/termux_setup_toolchain_29.sh#L11 https://github.com/termux/termux-packages/blob/eaad7e0549ccf2fc3aa4919dc15b8306ce61dffc/scripts/setup-termux.sh#L14 - This will make the default behavior of building software in Termux more consistently similar not only to the behavior of the vanilla Android NDK, and not only to behavior of the `termux_setup_toolchain_29()` and `setup-termux.sh` of termux-packages, but also to the behavior of the LLVM-based desktop Linux distro, Chimera Linux. - Any time `clang` is installed, all of the LLVM binutils in the `llvm` package are also already installed, just with `llvm-` prepended to their names, so for most situations, the `binutils` package is implementing duplicate functionality while taking up additional space %ci:no-build
diff --git a/disabled-packages/binutils-is-llvm/LICENSE b/disabled-packages/binutils-is-llvm/LICENSE
diff --git a/disabled-packages/binutils-is-llvm/build.sh b/disabled-packages/binutils-is-llvm/build.sh
diff --git a/packages/atool/build.sh b/packages/atool/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_SHA256="aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc7
 TERMUX_PKG_DEPENDS="perl"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_RECOMMENDS="arj, binutils-is-llvm | binutils, bzip2, cpio, file, gzip, lhasa, lzip, lzop, p7zip, tar, unrar, unzip, xz-utils, zip"
+TERMUX_PKG_RECOMMENDS="arj, llvm, bzip2, cpio, file, gzip, lhasa, lzip, lzop, p7zip, tar, unrar, unzip, xz-utils, zip"
 TERMUX_PKG_SUGGESTS="bash-completion"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
diff --git a/packages/binutils/binutils-bin.subpackage.sh b/packages/binutils/binutils-bin.subpackage.sh
diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh
@@ -6,13 +6,12 @@ TERMUX_PKG_MAINTAINER="@termux"
 # remember to rebuild it when updating `binutils`.
 TERMUX_PKG_VERSION="2.46.0"
 TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SRCURL="https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=d75a94f4d73e7a4086f7513e67e439e8fcdcbb726ffe63f4661744e6256b2cf2
-TERMUX_PKG_DEPENDS="binutils-bin, zlib, zstd"
-TERMUX_PKG_BREAKS="binutils (<< 2.46), binutils-libs, binutils-dev"
-TERMUX_PKG_REPLACES="binutils (<< 2.46), binutils-libs, binutils-dev"
+TERMUX_PKG_DEPENDS="libc++, zlib, zstd"
+TERMUX_PKG_BREAKS="binutils (<< 2.46), binutils-bin, binutils-libs, binutils-dev"
+TERMUX_PKG_REPLACES="binutils (<< 2.46), binutils-bin, binutils-libs, binutils-dev"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
---bindir=$TERMUX_PREFIX/libexec/binutils
 --disable-gprofng
 --enable-plugins
 --disable-werror
@@ -22,6 +21,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX"
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/windmc.1 share/man/man1/windres.1"
 TERMUX_PKG_NO_STATICSPLIT=true
+# will overwrite llvm binutils and llvm ld
+TERMUX_PKG_ON_DEVICE_BUILD_NOT_SUPPORTED=true
 TERMUX_PKG_GROUPS="base-devel"
 
 # For binutils-cross:
@@ -73,28 +74,27 @@ termux_step_pre_configure() {
 }
 
 termux_step_post_make_install() {
-	local dir="$TERMUX_PREFIX/share/binutils"
-	mkdir -p "$dir"
-	touch "$dir/.placeholder"
-
-	mkdir -p "$TERMUX_PREFIX/bin"
-	cd "$TERMUX_PREFIX/libexec/binutils" || termux_error_exit "failed to change into 'libexec/binutils' directory"
-
-	mv ld.bfd ld
-	ln -sf ld ld.bfd
-	ln -sfr "$TERMUX_PREFIX/libexec/binutils/ld" "$TERMUX_PREFIX/bin/ld.bfd"
-
-	local bin
-	for bin in ./*; do
-		ln -sfr "$TERMUX_PREFIX/libexec/binutils/$bin" \
-			"$TERMUX_PREFIX/bin/$bin"
-	done
-
-	# Setup symlinks as these are used when building, so used by
-	# system setup in e.g. python, perl and libtool:
-	local -a _TOOLS_WITH_HOST_PREFIX=("ar" "ld" "nm" "objdump" "ranlib" "readelf" "strip")
-	for bin in "${_TOOLS_WITH_HOST_PREFIX[@]}"; do
-		ln -sfr "$TERMUX_PREFIX/libexec/binutils/$bin" \
-			"$TERMUX_PREFIX/bin/$TERMUX_HOST_PLATFORM-$bin"
+	rm "${TERMUX_PREFIX}/bin/ld"
+	mv "${TERMUX_PREFIX}/share/man/man1/ld.1" \
+		"${TERMUX_PREFIX}/share/man/man1/ld.bfd.1"
+	local -a _BINUTILS_CONFLICTING_WITH_LLVM=(
+		"ar"
+		"addr2line"
+		"c++filt"
+		"nm"
+		"objcopy"
+		"objdump"
+		"ranlib"
+		"readelf"
+		"size"
+		"strings"
+		"strip"
+	)
+	local binutil
+	for binutil in "${_BINUTILS_CONFLICTING_WITH_LLVM[@]}"; do
+		mv "${TERMUX_PREFIX}/bin/${binutil}" \
+			"${TERMUX_PREFIX}/bin/g${binutil}"
+		mv "${TERMUX_PREFIX}/share/man/man1/${binutil}.1" \
+			"${TERMUX_PREFIX}/share/man/man1/g${binutil}.1"
 	done
 }
diff --git a/packages/debootstrap/build.sh b/packages/debootstrap/build.sh
@@ -4,10 +4,10 @@ TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_LICENSE_FILE="debian/copyright"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.0.142"
-TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SRCURL="https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=334b188c2bab5c1aa6f858a044274631d342f07f5ddec1bad870d728f02fd652
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_DEPENDS="binutils | binutils-is-llvm, perl, proot, sed, wget"
+TERMUX_PKG_DEPENDS="llvm, perl, proot, sed, wget"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
diff --git a/packages/flang/build.sh b/packages/flang/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="LLVM's Fortran frontend"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_LICENSE_FILE="flang/LICENSE.TXT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=21.1.8
+TERMUX_PKG_VERSION="21.1.8"
 TERMUX_PKG_SRCURL=(
 	"https://github.com/llvm/llvm-project/releases/download/llvmorg-${TERMUX_PKG_VERSION}/llvm-project-${TERMUX_PKG_VERSION}.src.tar.xz"
 	"https://github.com/llvm/llvm-project/releases/download/llvmorg-${TERMUX_PKG_VERSION}/LLVM-${TERMUX_PKG_VERSION}-Linux-X64.tar.xz"
diff --git a/packages/gauche/build.sh b/packages/gauche/build.sh
@@ -4,12 +4,12 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.9.15"
 TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://github.com/shirok/Gauche/releases/download/release${TERMUX_PKG_VERSION//./_}/Gauche-${TERMUX_PKG_VERSION}.tgz
+TERMUX_PKG_SRCURL="https://github.com/shirok/Gauche/releases/download/release${TERMUX_PKG_VERSION//./_}/Gauche-${TERMUX_PKG_VERSION}.tgz"
 TERMUX_PKG_SHA256=3643e27bc7c8822cfd6fb2892db185f658e8e364938bc2ccfcedb239e35af783
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_DEPENDS="gdbm, libcrypt, libiconv, mbedtls, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libatomic-ops"
-TERMUX_PKG_RECOMMENDS="binutils-is-llvm | binutils, ca-certificates"
+TERMUX_PKG_RECOMMENDS="llvm, ca-certificates"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_BUILD_IN_SRC=true
 
diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh
@@ -21,7 +21,7 @@ TERMUX_PKG_SHA256=(fdbb376f08242d917922a6a22a773980217fafa310046fc5d6459490af23d
                    5784d4cc47d0845af0897d3b7473a08dd0281a4cdabac0a486740840d014fde1)
 TERMUX_PKG_AUTO_UPDATE=false
 # dub dlopen()s libcurl.so:
-TERMUX_PKG_DEPENDS="binutils-bin, binutils-is-llvm | binutils, clang, libc++, libcurl, zlib"
+TERMUX_PKG_DEPENDS="binutils, clang, libc++, libcurl, zlib"
 TERMUX_PKG_BUILD_DEPENDS="binutils-cross"
 TERMUX_PKG_NO_STATICSPLIT=true
 TERMUX_PKG_HOSTBUILD=true
@@ -39,7 +39,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_INCLUDE_TESTS=OFF
 -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
 -DLLVM_CONFIG_PATH=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-config
--DPYTHON_EXECUTABLE=$(command -v python3)
+-DPYTHON_EXECUTABLE=$(command -v python3)ap
 -DLLVM_TARGETS_TO_BUILD='AArch64;ARM;WebAssembly;X86'
 "
 
diff --git a/packages/ldd/build.sh b/packages/ldd/build.sh
@@ -2,14 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-packages
 TERMUX_PKG_DESCRIPTION="Fake ldd command"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.3
+TERMUX_PKG_VERSION="0.3"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
-TERMUX_PKG_DEPENDS="bash, binutils-bin"
+TERMUX_PKG_DEPENDS="bash, llvm"
 TERMUX_PKG_CONFLICTS="binutils (<< 2.39-1)"
 
 termux_step_make_install() {
-	local _READELF=$TERMUX_PREFIX/libexec/binutils/readelf
+	local _READELF="$TERMUX_PREFIX/bin/readelf"
 
 	local ldd="$TERMUX_PREFIX/bin/ldd"
 	mkdir -p "$(dirname "${ldd}")"
diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
@@ -4,10 +4,10 @@ TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
 TERMUX_PKG_LICENSE_FILE="llvm/LICENSE.TXT"
 TERMUX_PKG_MAINTAINER="@finagolfin"
 # Keep flang version and revision in sync when updating (enforced by check in termux_step_pre_configure).
-TERMUX_PKG_VERSION=21.1.8
+TERMUX_PKG_VERSION="21.1.8"
 TERMUX_PKG_SHA256=4633a23617fa31a3ea51242586ea7fb1da7140e426bd62fc164261fe036aa142
 TERMUX_PKG_AUTO_UPDATE=false
-TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-${TERMUX_PKG_VERSION}/llvm-project-${TERMUX_PKG_VERSION}.src.tar.xz
+TERMUX_PKG_SRCURL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${TERMUX_PKG_VERSION}/llvm-project-${TERMUX_PKG_VERSION}.src.tar.xz"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="
 bin/ld64.lld.darwin*
@@ -53,6 +53,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_ENABLE_FFI=ON
 -DLLVM_ENABLE_RTTI=ON
 -DLLVM_INSTALL_UTILS=ON
+-DLLVM_INSTALL_BINUTILS_SYMLINKS=ON
 -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF
 "
 
@@ -166,6 +167,46 @@ termux_step_post_make_install() {
 		EOF
 		chmod u+x "$wrapper"
 	done
+
+	# Make lld provide ld
+	ln -sf ld.lld "${TERMUX_PREFIX}/bin/ld"
+	# https://bugs.llvm.org/show_bug.cgi?id=42455
+	install -Dm644 -t "${TERMUX_PREFIX}/share/man/man1" "$TERMUX_PKG_SRCDIR/docs/ld.lld.1"
+	ln -sf ld.lld.1.gz "${TERMUX_PREFIX}/share/man/man1/ld.1.gz"
+
+	# Make llvm provide manpages for binutils that -DLLVM_INSTALL_BINUTILS_SYMLINKS=ON installed
+	local -a _BINUTILS_CONFLICTING_WITH_LLVM=(
+		"ar"
+		"addr2line"
+		"c++filt"
+		"nm"
+		"objcopy"
+		"objdump"
+		"ranlib"
+		"readelf"
+		"size"
+		"strings"
+		"strip"
+	)
+	local binutil
+	for binutil in "${_BINUTILS_CONFLICTING_WITH_LLVM[@]}"; do
+		ln -sf "llvm-$binutil.1.gz" "${TERMUX_PREFIX}/share/man/man1/${binutil}.1.gz"
+	done
+
+	# Make llvm provide triplet-prefixed symbolic links which are used by some tools,
+	# like python, perl and libtool:
+	local -a _BINUTILS_WITH_HOST_PREFIX=(
+		"ar"
+		"ld"
+		"nm"
+		"objdump"
+		"ranlib"
+		"readelf"
+		"strip"
+	)
+	for binutil in "${_BINUTILS_WITH_HOST_PREFIX[@]}"; do
+		ln -sf "${binutil}" "${TERMUX_PREFIX}/bin/${TERMUX_HOST_PLATFORM}-${binutil}"
+	done
 }
 
 # shellcheck disable=SC2031
diff --git a/packages/libllvm/clang.subpackage.sh b/packages/libllvm/clang.subpackage.sh
@@ -12,7 +12,11 @@ bin/gcc
 bin/git-clang-format
 bin/hmaptool
 bin/intercept-build
-bin/*-linux-android*
+bin/*-linux-android*-clang
+bin/*-linux-android*-clang++
+bin/*-linux-android*-cpp
+bin/*-linux-android*-g++
+bin/*-linux-android*-gcc
 bin/modularize
 bin/nvptx-arch
 bin/offload-arch
diff --git a/packages/libllvm/lld.subpackage.sh b/packages/libllvm/lld.subpackage.sh
@@ -1,11 +1,18 @@
 TERMUX_SUBPKG_INCLUDE="
+bin/ld
 bin/ld.lld
 bin/ld64.lld
 bin/lld
 bin/lld-link
 bin/wasm-ld
+bin/*-linux-android*-ld
 include/lld/
 lib/cmake/lld/
 lib/liblld*.a
+share/man/man1/ld.1.gz
+share/man/man1/ld.lld.1.gz
 "
 TERMUX_SUBPKG_DESCRIPTION="LLVM-based linker"
+TERMUX_SUBPKG_BREAKS="binutils-is-llvm"
+TERMUX_SUBPKG_CONFLICTS="binutils-is-llvm"
+TERMUX_SUBPKG_REPLACES="binutils-is-llvm"
diff --git a/packages/libllvm/llvm.subpackage.sh b/packages/libllvm/llvm.subpackage.sh
@@ -1,4 +1,23 @@
 TERMUX_SUBPKG_INCLUDE="
+bin/*-linux-android*-ar
+bin/*-linux-android*-ld
+bin/*-linux-android*-nm
+bin/*-linux-android*-objdump
+bin/*-linux-android*-ranlib
+bin/*-linux-android*-readelf
+bin/*-linux-android*-strip
+bin/addr2line
+bin/ar
+bin/c++filt
+bin/ld
+bin/nm
+bin/objcopy
+bin/objdump
+bin/ranlib
+bin/readelf
+bin/size
+bin/strings
+bin/strip
 bin/bugpoint
 bin/dsymutil
 bin/llc
@@ -15,10 +34,22 @@ share/man/man1/dsymutil.1.gz
 share/man/man1/llc.1.gz
 share/man/man1/lli.1.gz
 share/man/man1/llvm!(-test-mustache-spec)
+share/man/man1/ar.1.gz
+share/man/man1/addr2line.1.gz
+share/man/man1/c++filt.1.gz
+share/man/man1/nm.1.gz
+share/man/man1/objcopy.1.gz
+share/man/man1/objdump.1.gz
+share/man/man1/ranlib.1.gz
+share/man/man1/readelf.1.gz
+share/man/man1/size.1.gz
+share/man/man1/strings.1.gz
+share/man/man1/strip.1.gz
 share/man/man1/opt.1.gz
 share/man/man1/*tblgen.1.gz
 share/opt-viewer
 "
 TERMUX_SUBPKG_DESCRIPTION="LLVM modular compiler and toolchain executables"
-TERMUX_SUBPKG_BREAKS="libllvm (<< 11.0.0-1)"
-TERMUX_SUBPKG_REPLACES="libllvm (<< 11.0.0-1)"
+TERMUX_SUBPKG_BREAKS="binutils-is-llvm, libllvm (<< 11.0.0-1)"
+TERMUX_SUBPKG_CONFLICTS="binutils-is-llvm"
+TERMUX_SUBPKG_REPLACES="binutils-is-llvm, libllvm (<< 11.0.0-1)"
diff --git a/packages/opencl-vendor-driver/build.sh b/packages/opencl-vendor-driver/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://termux.dev
 TERMUX_PKG_DESCRIPTION="OpenCL driver from system vendor"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.3
+TERMUX_PKG_VERSION="0.3"
 TERMUX_PKG_AUTO_UPDATE=false
-TERMUX_PKG_RECOMMENDS="binutils | binutils-is-llvm, ocl-icd, patchelf"
+TERMUX_PKG_RECOMMENDS="llvm, ocl-icd, patchelf"
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
 
 termux_step_make_install() {
diff --git a/packages/termux-apt-repo/build.sh b/packages/termux-apt-repo/build.sh
@@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-apt-repo
 TERMUX_PKG_DESCRIPTION="Script to create Termux apt repositories"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.5
+TERMUX_PKG_VERSION="0.5"
 TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://github.com/termux/termux-apt-repo/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SRCURL="https://github.com/termux/termux-apt-repo/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=22c2ad46e548a9b73179da072b798cbbe6767f2dcc99cc476fa88641f8595434
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
-# binutils for ar:
-TERMUX_PKG_DEPENDS="binutils-is-llvm | binutils, python, tar"
+# llvm for ar:
+TERMUX_PKG_DEPENDS="llvm, python, tar"
diff --git a/packages/termux-create-package/build.sh b/packages/termux-create-package/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=0.12.0
 TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/termux/termux-create-package/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=13bcc1264844e9865eeab19805f24ff28bbfac8d39c11bca66f4357fa70e6ace
-TERMUX_PKG_DEPENDS="binutils-is-llvm | binutils, python"
+TERMUX_PKG_DEPENDS="llvm, python"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
diff --git a/scripts/build/setup/termux_setup_no_integrated_as.sh b/scripts/build/setup/termux_setup_no_integrated_as.sh
@@ -1,13 +1,13 @@
 termux_setup_no_integrated_as() {
 	if [ "$TERMUX_ON_DEVICE_BUILD" = true ]; then
-		if [[ "$TERMUX_APP_PACKAGE_MANAGER" = "apt" && "$(dpkg-query -W -f '${db:Status-Status}\n' binutils-bin 2>/dev/null)" != "installed" ]] ||
-			[[ "$TERMUX_APP_PACKAGE_MANAGER" = "pacman" && ! "$(pacman -Q binutils-bin 2>/dev/null)" ]]; then
-			echo "Package 'binutils-bin' is not installed."
+		if [[ "$TERMUX_APP_PACKAGE_MANAGER" = "apt" && "$(dpkg-query -W -f '${db:Status-Status}\n' binutils 2>/dev/null)" != "installed" ]] ||
+			[[ "$TERMUX_APP_PACKAGE_MANAGER" = "pacman" && ! "$(pacman -Q binutils 2>/dev/null)" ]]; then
+			echo "Package 'binutils' is not installed."
 			echo "You can install it with"
 			echo
-			echo "  pkg install binutils-bin"
+			echo "  pkg install binutils"
 			echo
-			echo "  pacman -S binutils-bin"
+			echo "  pacman -S binutils"
 			echo
 			exit 1
 		fi
diff --git a/scripts/setup-termux.sh b/scripts/setup-termux.sh
@@ -11,7 +11,6 @@ PACKAGES+=" python"				# Used buildorder.py core script.
 PACKAGES+=" python-pip" # Necessary to install 'itstool' for on-device-building (since Ubuntu gets it from 'apt')
 PACKAGES+=" unzip"				# Used to extract *.zip source archives.
 PACKAGES+=" jq"					# Used for parsing repo.json.
-PACKAGES+=" binutils-is-llvm"			# Used for checking symbols.
 
 # Tier 2: requirements for building many other packages.
 PACKAGES+=" asciidoc"
diff --git a/x11-packages/xarchiver/build.sh b/x11-packages/xarchiver/build.sh
