[packages/icedtea8.git] / icedtea8-libpath.patch

diff -dur -x '*~' -x '*.orig' -x '*.rej' openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2016-07-25 07:38:24.000000000 +0200
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2016-09-20 09:17:58.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)) || defined(BUILTIN_SIM)
-#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.
Commit	Line	Data
19f47772 JK	1	diff -dur -x '~' -x '.orig' -x '*.rej' openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
	2	--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2016-07-25 07:38:24.000000000 +0200
	3	+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2016-09-20 09:17:58.000000000 +0200
	4	@@ -309,9 +309,9 @@
	5	// ...
	6	// 7: The default directories, normally /lib and /usr/lib.
	7	#if defined(AMD64) \|\| defined(_LP64) && (defined(SPARC) \|\| defined(PPC) \|\| defined(S390)) \|\| defined(BUILTIN_SIM)
17ad8c05 JK	8	-#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
	9	+#define DEFAULT_LIBPATH "/usr/lib64/java:/usr/lib64:/lib64:/lib:/usr/lib"
	10	#else
	11	-#define DEFAULT_LIBPATH "/lib:/usr/lib"
	12	+#define DEFAULT_LIBPATH "/usr/lib/java:/lib:/usr/lib"
	13	#endif
	14
19f47772	15	// Base path of extensions installed on the system.