libmsgpack: Update from 1.2.0 to 1.3.0

[termux-packages] / packages / jack / jack.sh

diff --git a/packages/jack/jack.sh b/packages/jack/jack.sh
index 3048e49..c439255 100755 (executable)
--- a/packages/jack/jack.sh
+++ b/packages/jack/jack.sh
@@ -1,10 +1,18 @@
-#!/system/bin/sh
+#!/bin/sh
 
 # There needs to be a folder at $ANDROID_DATA/dalvik-cache
 export ANDROID_DATA=@TERMUX_PREFIX@/var/android/
 mkdir -p $ANDROID_DATA/dalvik-cache
 
-LD_LIBRARY_PATH=/system/lib \
+# Find the right lib folder for dalvikvm. We cannot take LD_LIBRARY_PATH
+# as is since it contains Termux-supplied libraries which may clash with
+# system ones.
+LIBFOLDER=/system/lib
+if test -d /system/lib64; then
+       LIBFOLDER=/system/lib64
+fi
+
+LD_LIBRARY_PATH=$LIBFOLDER \
                exec dalvikvm -Xmx256m \
                -Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
                -cp @TERMUX_PREFIX@/share/dex/jack.jar com.android.jack.Main \