From b5661c0177f7df49aaf1055c81711cb9b4fc9a4b Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 19 Dec 2015 17:49:36 -0500
Subject: [PATCH] jack: Try to find right lib folder

---
 packages/jack/build.sh |  2 +-
 packages/jack/jack.sh  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/jack/build.sh b/packages/jack/build.sh
index a746e1104..deb758a2b 100755
--- a/packages/jack/build.sh
+++ b/packages/jack/build.sh
@@ -4,7 +4,7 @@
 TERMUX_PKG_HOMEPAGE=http://tools.android.com/tech-docs/jackandjill
 TERMUX_PKG_DESCRIPTION="Java Android Compiler Kit"
 TERMUX_PKG_VERSION="1.1-mr2"
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
 termux_step_make () {
diff --git a/packages/jack/jack.sh b/packages/jack/jack.sh
index 42e3cbb77..c439255da 100755
--- a/packages/jack/jack.sh
+++ b/packages/jack/jack.sh
@@ -4,7 +4,15 @@
 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 \