diff options
Diffstat (limited to 'package/openjdk/patches')
-rw-r--r-- | package/openjdk/patches/disable-sizers.patch | 12 | ||||
-rw-r--r-- | package/openjdk/patches/llvm-headers.patch | 21 |
2 files changed, 33 insertions, 0 deletions
diff --git a/package/openjdk/patches/disable-sizers.patch b/package/openjdk/patches/disable-sizers.patch index e69de29bb..46325008c 100644 --- a/package/openjdk/patches/disable-sizers.patch +++ b/package/openjdk/patches/disable-sizers.patch @@ -0,0 +1,12 @@ +--- w-openjdk-6.orig/openjdk-6/jdk/make/sun/xawt/Makefile 2011-02-28 17:06:12.000000000 +0100 ++++ w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile 2011-04-13 12:00:18.618922673 +0200 +@@ -237,7 +237,8 @@ + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + +-$(SIZES): $(SIZERS) ++$(SIZES): ++ $(prep-target) + @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ + $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ + $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ diff --git a/package/openjdk/patches/llvm-headers.patch b/package/openjdk/patches/llvm-headers.patch new file mode 100644 index 000000000..7014dcb88 --- /dev/null +++ b/package/openjdk/patches/llvm-headers.patch @@ -0,0 +1,21 @@ +diff -Nur openjdk-6.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp +--- openjdk-6.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-02-28 17:03:21.000000000 +0100 ++++ openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-04-29 18:07:20.171550601 +0200 +@@ -43,7 +43,7 @@ + #include <llvm/ModuleProvider.h> + #endif + #include <llvm/Support/IRBuilder.h> +-#include <llvm/System/Threading.h> ++#include <llvm/Support/Threading.h> + #include <llvm/Target/TargetSelect.h> + #include <llvm/Type.h> + #include <llvm/ExecutionEngine/JITMemoryManager.h> +@@ -52,7 +52,7 @@ + #include <llvm/ExecutionEngine/JIT.h> + #include <llvm/ADT/StringMap.h> + #include <llvm/Support/Debug.h> +-#include <llvm/System/Host.h> ++#include <llvm/Support/Host.h> + #endif + + #include <map> |