diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-12 19:12:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-12 19:12:38 +0200 |
| commit | fec1fd5598765d02691cb4c2b3ea3f1938be7824 (patch) | |
| tree | 78abeafc5125b3465a20d2a0a406f4de69d54bb8 /package/openjdk/patches | |
| parent | debc4a7d3c109490b833434c7e7bca7bf293c832 (diff) | |
| parent | 819692c26044aa5bb280a08fa017de9d55ca18b9 (diff) | |
merge
Diffstat (limited to 'package/openjdk/patches')
| -rw-r--r-- | package/openjdk/patches/disable-gamma.patch | 16 | ||||
| -rw-r--r-- | package/openjdk/patches/disable-sizers.patch | 14 |
2 files changed, 30 insertions, 0 deletions
diff --git a/package/openjdk/patches/disable-gamma.patch b/package/openjdk/patches/disable-gamma.patch new file mode 100644 index 000000000..92a80b3be --- /dev/null +++ b/package/openjdk/patches/disable-gamma.patch @@ -0,0 +1,16 @@ +--- w-openjdk-6-1.orig/openjdk-6/hotspot/make/linux/makefiles/buildtree.make 2011-02-28 17:03:13.000000000 +0100 ++++ w-openjdk-6-1/openjdk-6/hotspot/make/linux/makefiles/buildtree.make 2011-04-11 12:47:31.000000000 +0200 +@@ -352,12 +352,8 @@ + echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \ + echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \ + echo "then"; \ +- echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \ ++ echo " exit 0;"; \ + echo "fi"; \ +- echo "rm -f Queens.class"; \ +- echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ +- echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ +- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ + ) > $@ + $(QUIETLY) chmod +x $@ + diff --git a/package/openjdk/patches/disable-sizers.patch b/package/openjdk/patches/disable-sizers.patch new file mode 100644 index 000000000..b80ee0e69 --- /dev/null +++ b/package/openjdk/patches/disable-sizers.patch @@ -0,0 +1,14 @@ +diff -Nur w-openjdk-6.orig//openjdk-6/jdk/make/sun/xawt/Makefile w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile +--- 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-11 19:50:34.000000000 +0200 +@@ -237,7 +237,9 @@ + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + +-$(SIZES): $(SIZERS) ++#$(SIZES): $(SIZERS) ++$(SIZES): ++ @$(prep-target) + @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ + $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ + $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ |