diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
| commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
| tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /package/openjdk/patches/disable-gamma.patch | |
| parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
| parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'package/openjdk/patches/disable-gamma.patch')
| -rw-r--r-- | package/openjdk/patches/disable-gamma.patch | 16 |
1 files changed, 16 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 $@ + |