This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository javatools.
commit bde31781d941339b27db637b23ef6f65ef93cf08 Author: Markus Koschany <[email protected]> Date: Tue Dec 9 10:05:12 2014 +0100 jarwrapper: Add MULTIARCH_LIBRARY_PATH variable. Add all multiarch jni paths of all known architectures to MULTIARCH_LIBRARY_PATH. This ensures that applications which make use of Multiarch will find the corresponding libraries no matter which JRE is used by the user. --- jarwrapper | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jarwrapper b/jarwrapper index 4ae1dd6..fcf3fbc 100755 --- a/jarwrapper +++ b/jarwrapper @@ -19,7 +19,7 @@ NEW_JAVA_HOMES="$(perl -0nE 's{\r?\n\s}{}gsm; print $1 if m{^Debian-Java-Home:\s JAVAOPTS="$(perl -0nE 's{\r?\n\s}{}gsm; print $1 if m{^Debian-Java-Parameters:\s*([^\r\n]+)}m;' "$TEMP/META-INF/MANIFEST.MF")" rm -rf "$TEMP" -for i in $NEW_JAVA_HOMES; do +for i in $NEW_JAVA_HOMES; do if [ -x "$i/bin/java" ]; then JAVA="$i/bin/java" JAVA_HOME="$i" @@ -33,9 +33,12 @@ 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/ [...] + + if which "$JAVA" >/dev/null 2>&1; then - export LD_LIBRARY_PATH=/usr/lib/jni - exec $JAVA $JAVAOPTS -jar "$JAR" "$@" + export LD_LIBRARY_PATH=$MULTIARCH_LIBRARY_PATH + exec $JAVA $JAVAOPTS -Djava.library.path=$MULTIARCH_LIBRARY_PATH -jar "$JAR" "$@" 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" + 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/pkg-java/javatools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
