diff options
Diffstat (limited to 'pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch')
-rw-r--r-- | pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch b/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch deleted file mode 100644 index ce30edb7f1d9..000000000000 --- a/pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 83f97773ea99fe2191a49e551ea43d51c9a765cd Mon Sep 17 00:00:00 2001 -Subject: [PATCH] strip some hard-coded default paths for libs and extensions - ---- - src/hotspot/os/linux/os_linux.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 476b1c2175..2695ed2301 100644 ---- a/src/hotspot/os/linux/os_linux.cpp -+++ b/src/hotspot/os/linux/os_linux.cpp -@@ -417,20 +417,20 @@ void os::init_system_properties_values() { - // ... - // 7: The default directories, normally /lib and /usr/lib. - #if defined(AMD64) || (defined(_LP64) && defined(SPARC)) || defined(PPC64) || defined(S390) -- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" -+ #define DEFAULT_LIBPATH "" - #else - #if defined(AARCH64) - // Use 32-bit locations first for AARCH64 (a 64-bit architecture), since some systems - // might not adhere to the FHS and it would be a change in behaviour if we used - // DEFAULT_LIBPATH of other 64-bit architectures which prefer the 64-bit paths. -- #define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib64:/lib64" -+ #define DEFAULT_LIBPATH "" - #else -- #define DEFAULT_LIBPATH "/lib:/usr/lib" -+ #define DEFAULT_LIBPATH "" - #endif // AARCH64 - #endif - - // Base path of extensions installed on the system. --#define SYS_EXT_DIR "/usr/java/packages" -+#define SYS_EXT_DIR "" - #define EXTENSIONS_DIR "/lib/ext" - - // Buffer that fits several sprintfs. -@@ -490,13 +490,13 @@ void os::init_system_properties_values() { - strlen(v) + 1 + - sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1, - mtInternal); -- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); -+ sprintf(ld_library_path, "%s", v); - Arguments::set_library_path(ld_library_path); - FREE_C_HEAP_ARRAY(char, ld_library_path); - } - - // Extensions directories. -- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); -+ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); - Arguments::set_ext_dirs(buf); - - FREE_C_HEAP_ARRAY(char, buf); --- -2.35.1 - |