diff options
author | 2023-11-14 12:36:15 +0100 | |
---|---|---|
committer | 2023-11-14 12:38:42 +0100 | |
commit | 951de94124539904d9aa498d89ae8f0daf8aa508 (patch) | |
tree | 89e69126aff8330245ed07c2c6913f9fc052f649 | |
parent | allow java-config to parse inverted conditions. (diff) | |
download | java-config-951de94124539904d9aa498d89ae8f0daf8aa508.tar.gz java-config-951de94124539904d9aa498d89ae8f0daf8aa508.tar.bz2 java-config-951de94124539904d9aa498d89ae8f0daf8aa508.zip |
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>
-rwxr-xr-x | src/gjl | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -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: |