diff --git a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source5.patchset b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source5.patchset index e988fbc49..245b7dab9 100644 --- a/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source5.patchset +++ b/dev-lang/openjdk/patches/openjdk-1.7_2013_11_08-source5.patchset @@ -1,4 +1,4 @@ -From e032d4cc66331930cfa668026ff1058099bdb093 Mon Sep 17 00:00:00 2001 +From 428b96e741cc34dc4e7e3213a9c9ba312c78e943 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 25 Nov 2013 17:08:56 +0100 Subject: vm/opto/addnode.cpp: Fix redefinition of MAXFLOAT @@ -29,7 +29,7 @@ index 33ecf15..83ed7d3 100644 1.8.3.4 -From 5b7706e200ace7a597e513b44b5dc132ba3ac4ad Mon Sep 17 00:00:00 2001 +From d925994749a3e56f1e57c1bbb534b745842964c2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 25 Nov 2013 17:10:01 +0100 Subject: constantPoolOopDesc::method_at_if_loaded(): Fix return value @@ -52,7 +52,7 @@ index a46f4eb..d673215 100644 1.8.3.4 -From ede8bff6104e803324604b0a93a402a2a2c7f783 Mon Sep 17 00:00:00 2001 +From 6aa8090dc672a2c2750fb33ab703280ea5e52162 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 25 Nov 2013 17:11:30 +0100 Subject: CountedLoopNode: Fix return value @@ -74,3 +74,26 @@ index eb138f5..f03ee1b 100644 -- 1.8.3.4 + +From c03ad98680bd582e73aa60c8d82bc713b73fc7f9 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 26 Nov 2013 17:45:02 +0100 +Subject: os_haiku.cpp: Update DEFAULT_LIBPATH + + +diff --git a/src/os/haiku/vm/os_haiku.cpp b/src/os/haiku/vm/os_haiku.cpp +index 963eb0f..c87fbea 100644 +--- a/src/os/haiku/vm/os_haiku.cpp ++++ b/src/os/haiku/vm/os_haiku.cpp +@@ -281,7 +281,7 @@ void os::init_system_properties_values() { + * ... + * 7: The default directories, normally /lib and /usr/lib. + */ +-#define DEFAULT_LIBPATH "%A/lib:/boot/home/config/lib:/boot/common/lib:/boot/system/lib" ++#define DEFAULT_LIBPATH "%A/lib:/boot/home/config/non-packaged/lib:/boot/home/config/lib:/boot/system/non-packaged/lib:/boot/system/lib" + + #define EXTENSIONS_DIR "/lib/ext" + #define ENDORSED_DIR "/lib/endorsed" +-- +1.8.3.4 +