[packages/openjdk8] libpath.patch from icedtea7
jajcus
jajcus at pld-linux.org
Fri Sep 18 13:03:21 CEST 2015
commit ce94f0111198da5bd8b28a60939686ea4078ab18
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Fri Sep 18 12:55:53 2015 +0200
libpath.patch from icedtea7
Makes sure extension modules are loaded from %{_libdir}/java
libpath.patch | 15 +++++++++++++++
openjdk8.spec | 2 ++
2 files changed, 17 insertions(+)
---
diff --git a/openjdk8.spec b/openjdk8.spec
index 890179b..72d422e 100644
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -50,6 +50,7 @@ Source10: make-cacerts.sh
Patch0: adjust-mflags.patch
Patch1: format_strings.patch
Patch2: CompileDemos.patch
+Patch3: libpath.patch
URL: http://openjdk.java.net/
BuildRequires: alsa-lib-devel
BuildRequires: ant
@@ -408,6 +409,7 @@ done
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
diff --git a/libpath.patch b/libpath.patch
new file mode 100644
index 0000000..a9d217c
--- /dev/null
+++ b/libpath.patch
@@ -0,0 +1,15 @@
+diff -dur -x '*~' -x '*.orig' -x '*.rej' jdk8u-jdk8u66-b02.orig/hotspot/src/os/linux/vm/os_linux.cpp jdk8u-jdk8u66-b02/hotspot/src/os/linux/vm/os_linux.cpp
+--- jdk8u-jdk8u66-b02.orig/hotspot/src/os/linux/vm/os_linux.cpp 2015-07-22 19:12:56.000000000 +0200
++++ jdk8u-jdk8u66-b02/hotspot/src/os/linux/vm/os_linux.cpp 2015-09-18 12:54:54.000000000 +0200
+@@ -309,9 +309,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/java:/usr/lib64:/lib64:/lib:/usr/lib"
+ #else
+-#define DEFAULT_LIBPATH "/lib:/usr/lib"
++#define DEFAULT_LIBPATH "/usr/lib/java:/lib:/usr/lib"
+ #endif
+
+ // Base path of extensions installed on the system.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk8.git/commitdiff/7c01df73b64a95b35ee0b29ecd6e76a766cd041b
More information about the pld-cvs-commit
mailing list