pick: Update from 1.5.3 to 1.5.4

[termux-packages] / packages / termux-tools / build.sh

diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh
index 4753fed..9e482a3 100644 (file)
--- a/packages/termux-tools/build.sh
+++ b/packages/termux-tools/build.sh
@@ -1,23 +1,18 @@
 TERMUX_PKG_HOMEPAGE=https://termux.com/
 TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
-TERMUX_PKG_VERSION=0.33
+TERMUX_PKG_VERSION=0.35
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
 termux_step_make_install () {
        # Remove LD_LIBRARY_PATH from environment to avoid conflicting
-       # with system libraries that am may link against.
+       # with system libraries that system binaries may link against:
        for tool in am df getprop logcat ping ping6 ip pm settings; do
                WRAPPER_FILE=$TERMUX_PREFIX/bin/$tool
                echo '#!/bin/sh' > $WRAPPER_FILE
-
-               # Some of these tools (am,dalvikvm,?) requires LD_LIBRARY_PATH setup on at least some devices:
-               echo 'if [ -f /system/bin/linker64 ]; then BITS=64; else BITS=; fi' >> $WRAPPER_FILE
-               echo -n 'LD_LIBRARY_PATH=/system/lib$BITS ' >> $WRAPPER_FILE
-
+               echo 'unset LD_LIBRARY_PATH' >> $WRAPPER_FILE
                # Some tools require having /system/bin/app_process in the PATH,
                # at least am&pm on a Nexus 6p running Android 6.0:
                echo -n 'PATH=$PATH:/system/bin ' >> $WRAPPER_FILE
-
                echo "exec /system/bin/$tool \"\$@\"" >> $WRAPPER_FILE
                chmod +x $TERMUX_PREFIX/bin/$tool
        done