From 2dcff5266a6c1ed39e49b24b8d2984a165ad9c35 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Fri, 16 Oct 2015 19:29:38 +0200 Subject: openjdk-6: remove Since OpenJDK-6 is not maintained anymore, it's more reasonable to move to OpenJDK-8 instead of sticking at unmaintained, upstream not supported VM version. Signed-off-by: Jens Rehsack Signed-off-by: Otavio Salvador --- recipes-core/openjdk/openjdk-6/build-hacks.patch | 31 ------------------------ 1 file changed, 31 deletions(-) delete mode 100644 recipes-core/openjdk/openjdk-6/build-hacks.patch (limited to 'recipes-core/openjdk/openjdk-6/build-hacks.patch') diff --git a/recipes-core/openjdk/openjdk-6/build-hacks.patch b/recipes-core/openjdk/openjdk-6/build-hacks.patch deleted file mode 100644 index 02a8300..0000000 --- a/recipes-core/openjdk/openjdk-6/build-hacks.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: icedtea6-1.8/Makefile.am -=================================================================== ---- icedtea6-1.8.orig/Makefile.am 2010-04-12 23:55:51.754838172 +0200 -+++ icedtea6-1.8/Makefile.am 2010-06-16 15:17:10.224708601 +0200 -@@ -477,6 +477,11 @@ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ -+ OE_CFLAGS="$(OE_CFLAGS)" \ -+ OE_CPPFLAGS="$(OE_CPPFLAGS)" \ -+ OE_CXXFLAGS="$(OE_CXXFLAGS)" \ -+ OE_LDFLAGS="$(OE_LDFLAGS)" \ -+ OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ - DISTRIBUTION_ID="$(DIST_ID)" \ - DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ - DEBUG_CLASSFILES="true" \ -Index: icedtea6-1.8/javac.in -=================================================================== ---- icedtea6-1.8.orig/javac.in 2010-03-25 15:10:41.714835519 +0100 -+++ icedtea6-1.8/javac.in 2010-06-16 15:14:31.205334756 +0200 -@@ -35,7 +35,9 @@ - elif [ ! -z "@ECJ@" ] ; then - @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS - else -+ # Compiling hotspot-tools consumes tons of memory and exceeds any default -+ # limits for jamvm and cacao. - CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \ -- @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS -+ @JAVA@ -Xmx1024m org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS - fi - -- cgit v1.2.3-54-g00ecf