From a005c5b58ffc92f85c81c50512dfbf20c656c32c Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Tue, 31 Mar 2015 10:22:37 -0300 Subject: openjdk-7: add /usr/lib/jni to DEFAULT_LIBPATH Some recipes install JNI-based bindings into /usr/lib/jni (e.g., rxtx), so it's sensible to add this directory to DEFAULT_LIBPATH (java.library.path). That's also how Debian does. Signed-off-by: Mario Domenech Goulart Signed-off-by: Otavio Salvador --- .../icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch | 19 +++++++++++++++++++ recipes-core/openjdk/openjdk-7-release-25b30.inc | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 recipes-core/openjdk/openjdk-7-25b30/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch (limited to 'recipes-core') diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch new file mode 100644 index 0000000..fb48879 --- /dev/null +++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch @@ -0,0 +1,19 @@ +From: Mario Domenech Goulart +Organization: O.S. Systems Software LTDA. + +Upstream-Status: Pending +--- +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2015-03-30 13:43:43.433168285 -0300 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2015-03-30 13:45:57.601833592 -0300 +@@ -388,9 +388,9 @@ + * 7: The default directories, normally /lib and /usr/lib. + */ + #if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390)) +-#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" ++#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib:/usr/lib64/jni:/usr/lib/jni" + #else +-#define DEFAULT_LIBPATH "/lib:/usr/lib" ++#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib/jni" + #endif + + #define EXTENSIONS_DIR "/lib/ext" diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc index 3b7d84e..9888ce3 100644 --- a/recipes-core/openjdk/openjdk-7-release-25b30.inc +++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc @@ -81,6 +81,7 @@ ICEDTEAPATCHES = "\ file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ file://icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch;apply=no \ file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no \ + file://icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch;apply=no \ " ICEDTEAPATCHES_append_powerpc = " \ file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ @@ -112,6 +113,7 @@ DISTRIBUTION_PATCHES = "\ patches/icedtea-jdk-nio-use-host-cc.patch \ patches/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch \ patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \ + patches/icedtea-add-usr-lib-jni-to-DEFAULT_LIBPATH.patch \ " DISTRIBUTION_PATCHES_append_libc-uclibc = "\ -- cgit v1.2.3-54-g00ecf