[javatools] 01/01: Add an additional check for the GIJ bytecode interpreter and

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository javatools.

commit 550c7f34f5df455400be0f9bd5e31ec32ebe80c7
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Dec 9 16:30:20 2014 +0100

    Add an additional check for the GIJ bytecode interpreter and
    
    let it handle the library path by itself.
---
 debian/changelog | 3 ++-
 jarwrapper       | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d16fdd7..43bfb9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ javatools (0.48) unstable; urgency=medium
   * jarwrapper: Add MULTIARCH_LIBRARY_PATH variables for 32bit and 64bit arches
     which contain all known multiarch jni library paths and use this as
     value for -Djava.library.path depending on the JVM that is used to
-    launch the application.
+    launch the application. Add an additional check for the GIJ bytecode
+    interpreter and let it handle the library path by itself.
     This ensures that all JVM will find the corresponding libraries correctly.
     (Closes: #764630)
 
diff --git a/jarwrapper b/jarwrapper
index de2c4e7..3693882 100755
--- a/jarwrapper
+++ b/jarwrapper
@@ -38,6 +38,11 @@ MULTIARCH_LIBRARY_PATH_32BIT="/usr/lib/jni:/usr/lib/arm-linux-gnueabi/jni:/usr/l
 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
+    if gij --version | grep "GNU libgcj" > /dev/null; then
+        # Let GNU gij handle the library path by itself
+        export LD_LIBRARY_PATH=/usr/lib/jni
+        exec $JAVA $JAVAOPTS -jar "$JAR" "$@"
+    fi
     if java -d32 2>&1 | grep "does not support" > /dev/null; then
         # 64bit
         export LD_LIBRARY_PATH=$MULTIARCH_LIBRARY_PATH_64BIT

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