ldd: Depend on binutils-bin

* Include `libaaudio.so` in list of system libs

* Name myself as the maintainer

packages/ldd/build.sh

@@ -1,19 +1,21 @@
 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.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_MAINTAINER="@xtkoba"
+TERMUX_PKG_VERSION=0.2
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
-TERMUX_PKG_DEPENDS="bash, binutils-is-llvm | binutils"
+TERMUX_PKG_DEPENDS="bash, binutils-bin"
 TERMUX_PKG_CONFLICTS="binutils (<< 2.39-1)"
 
 termux_step_make_install() {
+	local _READELF=$TERMUX_PREFIX/libexec/binutils/readelf
+
 	local ldd="$TERMUX_PREFIX/bin/ldd"
 	mkdir -p "$(dirname "${ldd}")"
 	rm -rf "${ldd}"
 	sed "$TERMUX_PKG_BUILDER_DIR/ldd.in" \
 		-e "s|@ARCH_BITS@|${TERMUX_ARCH_BITS}|g" \
+		-e "s|@READELF@|${_READELF}|g" \
 		> "${ldd}"
 	chmod 0700 "${ldd}"
 }

packages/ldd/ldd.in

@@ -5,7 +5,7 @@ if [ "@ARCH_BITS@" == "64" ]; then
     KLIBPATH+=64
 fi
 
-system_libs=(libEGL.so libGLESv1_CM.so libGLESv2.so libGLESv3.so libOpenMAXAL.so libOpenSLES.so libandroid.so libc.so libcamera2ndk.so libdl.so libjnigraphics.so liblog.so libm.so libmediandk.so libstdc++.so libvulkan.so libz.so)
+system_libs=(libEGL.so libGLESv1_CM.so libGLESv2.so libGLESv3.so libOpenMAXAL.so libOpenSLES.so libaaudio.so libandroid.so libc.so libcamera2ndk.so libdl.so libjnigraphics.so liblog.so libm.so libmediandk.so libstdc++.so libvulkan.so libz.so)
 
 do_search() {
     local f="$1"
@@ -27,11 +27,11 @@ do_search() {
             IFS=: runpath+=($LD_LIBRARY_PATH)
         fi
     else
-        IFS=: runpath+=($(readelf -d "$f" | sed -n 's/^.*(RUNPATH).*\[\(.*\)\]$/\1/p'))
+        IFS=: runpath+=($(@READELF@ -d "$f" | sed -n 's/^.*(RUNPATH).*\[\(.*\)\]$/\1/p'))
     fi
     runpath+=("/system/$KLIBPATH")
     local needed
-    IFS=$'\n' needed=($(readelf -d "$f" | sed -n 's/^.*(NEEDED).*\[\(.*\)\]$/\1/p'))
+    IFS=$'\n' needed=($(@READELF@ -d "$f" | sed -n 's/^.*(NEEDED).*\[\(.*\)\]$/\1/p'))
     local libs=()
     local l
     for l in "${needed[@]}"; do

scripts/build/setup/termux_setup_gir.sh

@@ -80,6 +80,7 @@ termux_setup_gir() {
 				unset LD_LIBRARY_PATH
 			EOF
 			sed 1d "$TERMUX_SCRIPTDIR/packages/ldd/ldd.in" >> "$ldd"
+			sed -i 's|@READELF@|'"$(command -v readelf)"'|g' "$ldd"
 			chmod 0700 "$ldd"
 		fi
 	fi