[Reproducible-commits] [javatools] 05/12: Improve detection of Multiarch library path for 32bit and 64bit architectures

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository javatools.

commit a9edbf333255dfd419d3c509f405889aef3eb8aa
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Dec 9 13:25:28 2014 +0100

    Improve detection of Multiarch library path for 32bit and 64bit architectures
---
 jarwrapper | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/jarwrapper b/jarwrapper
index fcf3fbc..de2c4e7 100755
--- a/jarwrapper
+++ b/jarwrapper
@@ -33,12 +33,20 @@ if [ -z "$JAVA" ]; then
    JAVA=java
 fi
 
-MULTIARCH_LIBRARY_PATH="/usr/lib/jni:/usr/lib/alpha-linux-gnu/jni:/usr/lib/x86_64-linux-gnu/jni:/usr/lib/aarch64-linux-gnu/jni:/usr/lib/arm-linux-gnueabi/jni:/usr/lib/arm-linux-gnueabihf/jni:/usr/lib/i386-gnu/jni:/usr/lib/i386-linux-gnu/jni:/usr/lib/x86_64-kfreebsd-gnu/jni:/usr/lib/i386-kfreebsd-gnu/jni:/usr/lib/mips-linux-gnu/jni:/usr/lib/mipsel-linux-gnu/jni:/usr/lib/powerpc-linux-gnu/jni:/usr/lib/powerpc-linux-gnuspe/jni:/usr/lib/powerpc64-linux-gnu/jni:/usr/lib/powerpc64le-linux-gnu/ [...]
+MULTIARCH_LIBRARY_PATH_32BIT="/usr/lib/jni:/usr/lib/arm-linux-gnueabi/jni:/usr/lib/arm-linux-gnueabihf/jni:/usr/lib/i386-gnu/jni:/usr/lib/i386-linux-gnu/jni:/usr/lib/x86_64-kfreebsd-gnu/jni:/usr/lib/i386-kfreebsd-gnu/jni:/usr/lib/mips-linux-gnu/jni:/usr/lib/mipsel-linux-gnu/jni:/usr/lib/powerpc-linux-gnu/jni:/usr/lib/powerpc-linux-gnuspe/jni:/usr/lib/sparc-linux-gnu/jni:/usr/lib/x86_64-linux-gnux32/jni:/usr/lib/hppa-linux-gnu/jni:/usr/lib/sh4-linux-gnu/jni:/usr/lib/m68k-linux-gnu/jni"
 
+MULTIARCH_LIBRARY_PATH_64BIT="/usr/lib/jni:/usr/lib/alpha-linux-gnu/jni:/usr/lib/x86_64-linux-gnu/jni:/usr/lib/aarch64-linux-gnu/jni:/usr/lib/x86_64-kfreebsd-gnu/jni:/usr/lib/powerpc64-linux-gnu/jni:/usr/lib/powerpc64le-linux-gnu/jni:/usr/lib/s390x-linux-gnu/jni:/usr/lib/sparc64-linux-gnu/jni"
 
 if which "$JAVA" >/dev/null 2>&1; then
-    export LD_LIBRARY_PATH=$MULTIARCH_LIBRARY_PATH
-    exec $JAVA $JAVAOPTS -Djava.library.path=$MULTIARCH_LIBRARY_PATH -jar "$JAR" "$@"
+    if java -d32 2>&1 | grep "does not support" > /dev/null; then
+        # 64bit
+        export LD_LIBRARY_PATH=$MULTIARCH_LIBRARY_PATH_64BIT
+        exec $JAVA $JAVAOPTS -Djava.library.path=$MULTIARCH_LIBRARY_PATH_64BIT -jar "$JAR" "$@"
+    else
+        # 32bit
+        export LD_LIBRARY_PATH=$MULTIARCH_LIBRARY_PATH_32BIT
+        exec $JAVA $JAVAOPTS -Djava.library.path=$MULTIARCH_LIBRARY_PATH_32BIT -jar "$JAR" "$@"
+    fi
 else
     echo "In order to run Java programs you must install a compatible JRE. If you don't know what JRE you need, default-jre is probably a good bet"
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/javatools.git