gjl: obtain library directory via LIBDIR

Newer versions of java-config-2.eclass will record LIBDIR in
package.env, which we obtain in gjl and use to set java.library.path
when invoking the Java VM.

Bug: https://bugs.gentoo.org/917326
Signed-off-by: Florian Schmaus <flow@gentoo.org>

1 files changed, 9 insertions, 1 deletions

diff --git a/src/gjl b/src/gjl
index 1639ef2..1baa899 100755
--- a/src/gjl
+++ b/src/gjl
@@ -47,7 +47,15 @@ def get_args(pkg):
     envlp = os.getenv('LD_LIBRARY_PATH')
     envjlp = os.getenv('JAVA_LIBRARY_PATH')
 
-    newlibrary = manager.eprefix + '/lib:'+ manager.eprefix + '/usr/lib'
+    libdir = pkg.query('LIBDIR')
+    if libdir:
+        newlibrary = manager.eprefix + '/' + libdir
+    else:
+        # Old, obsolete fallback path for packages that where
+        # installed before java-utils-2.eclass recorded LIBDIR.
+        # Bug #917326.
+        newlibrary = manager.eprefix + '/lib:'+ manager.eprefix + '/usr/lib'
+
     if library:
         newlibrary = ':'.join((library, newlibrary))
     if envjlp: