openjdk6: add latest 1.12 icedtea version

3 files changed, 158 insertions, 0 deletions

diff --git a/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
new file mode 100644
index 0000000..b1e679d
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
@@ -0,0 +1,86 @@
+Index: icedtea6-1.12.4/Makefile.am
+===================================================================
+--- icedtea6-1.12.4.orig/Makefile.am    2013-03-04 22:31:44.256894152 +0100
++++ icedtea6-1.12.4/Makefile.am 2013-03-10 14:30:16.089527572 +0100
+@@ -656,6 +656,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)" \
+        ANT_RESPECT_JAVA_HOME="TRUE" \
+        DISTRIBUTION_ID="$(DIST_ID)" \
+        DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
+@@ -2249,10 +2254,14 @@
+ if BUILD_JAMVM
+        cd jamvm/jamvm && \
+        LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
+-       ./autogen.sh --with-java-runtime-library=openjdk6 \
+-         --prefix=$(abs_top_builddir)/jamvm/install ; \
+-       $(MAKE) ; \
+-       $(MAKE) install
++       $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk6 \
++               --prefix=$(abs_top_builddir)/jamvm/install \
++               --host=$(host_alias) \
++               --build=$(build_alias) \
++               --target=$(target_alias)  \
++               --with-libtool-sysroot ; \
++       $(ARCH_PREFIX) $(MAKE) ; \
++       $(ARCH_PREFIX) $(MAKE) install
+        mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+        cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+        ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
+@@ -2316,6 +2325,7 @@
+          --host=$(host_alias) \
+          --build=$(build_alias) \
+          --target=$(target_alias) \
++         --with-libtool-sysroot \
+          --prefix=$(abs_top_builddir)/cacao/install \
+          --with-java-runtime-library=openjdk \
+          --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
+@@ -2384,7 +2394,7 @@
+ # configure script arguments, quoted in single quotes
+ CONFIGURE_ARGS = @CONFIGURE_ARGS@
+ ADD_ZERO_CONFIGURE_ARGS = \
+-       --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
++       --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
+        --enable-zero
+ if ADD_SHARK_BUILD
+ ADD_ZERO_CONFIGURE_ARGS += \
+Index: icedtea6-1.12.4/javac.in
+===================================================================
+--- icedtea6-1.12.4.orig/javac.in       2013-03-04 22:29:36.932613635 +0100
++++ icedtea6-1.12.4/javac.in    2013-03-10 14:20:35.244778409 +0100
+@@ -18,7 +18,7 @@
+ {
+     my @new_args = @{$_[0]};
+ 
+-    for my $opt (NO_DUP_ARGS) 
++    for my $opt (NO_DUP_ARGS)
+     {
+        my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+        if (@indices > 1) {
+@@ -27,7 +27,7 @@
+        }
+     }
+ 
+-    for my $opt (STRIP_ARGS) 
++    for my $opt (STRIP_ARGS)
+     {
+        my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+        splice @new_args, $_, 1 for @indices;
+@@ -69,7 +69,10 @@
+     my @CLASSPATH = ('@ECJ_JAR@');
+     push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+     $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+-    exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
++
++    # Compiling hotspot-tools consumes tons of memory and exceeds any default
++    # limits for jamvm and cacao.
++    exec '@JAVA@', '-Xmx1024m', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
+ }
+ else
+ {
diff --git a/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch
new file mode 100644
index 0000000..9741ed0
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch
@@ -0,0 +1,51 @@
+Index: icedtea6-1.12.4/acinclude.m4
+===================================================================
+--- icedtea6-1.12.4.orig/acinclude.m4   2013-03-04 22:29:36.000000000 +0100
++++ icedtea6-1.12.4/acinclude.m4        2013-03-10 13:45:56.032412186 +0100
+@@ -938,6 +938,21 @@
+   AC_SUBST(ALT_CACAO_SRC_DIR)
+ ])
+ 
++AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD],
++[
++  AC_MSG_CHECKING(for compiler used for subsidiary programs)
++  AC_ARG_WITH([cc-for-build],
++              [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)],
++  [
++    CC_FOR_BUILD="${withval}"
++  ],
++  [
++    CC_FOR_BUILD="\$(CC)"
++  ])
++  AC_MSG_RESULT(${CC_FOR_BUILD})
++  AC_SUBST(CC_FOR_BUILD)
++])
++
+ AC_DEFUN([IT_WITH_GCJ],
+ [
+   AC_MSG_CHECKING([whether to compile ecj natively])
+Index: icedtea6-1.12.4/Makefile.am
+===================================================================
+--- icedtea6-1.12.4.orig/Makefile.am    2013-03-10 13:44:55.000000000 +0100
++++ icedtea6-1.12.4/Makefile.am 2013-03-10 13:46:27.540523062 +0100
+@@ -656,6 +656,7 @@
+        JAVAC="" \
+        JAVA_HOME="" \
+        JDK_HOME="" \
++       CC_FOR_BUILD="$(CC_FOR_BUILD)" \
+        OE_CFLAGS="$(OE_CFLAGS)" \
+        OE_CPPFLAGS="$(OE_CPPFLAGS)" \
+        OE_CXXFLAGS="$(OE_CXXFLAGS)" \
+Index: icedtea6-1.12.4/configure.ac
+===================================================================
+--- icedtea6-1.12.4.orig/configure.ac   2013-03-04 22:38:51.000000000 +0100
++++ icedtea6-1.12.4/configure.ac        2013-03-10 13:45:56.032412186 +0100
+@@ -18,6 +18,8 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ 
++AC_CHECK_WITH_CC_FOR_BUILD
++
+ IT_FIND_TOOL([MAKE], [make])
+ IT_FIND_TOOL([GZIP], [gzip])
+ IT_FIND_TOOL([ANT], [ant])
diff --git a/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch b/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch
new file mode 100644
index 0000000..7161b75
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch
@@ -0,0 +1,21 @@
+Index: icedtea6-1.12.4/configure.ac
+===================================================================
+--- icedtea6-1.12.4.orig/configure.ac   2013-03-10 14:04:34.072354787 +0100
++++ icedtea6-1.12.4/configure.ac        2013-03-10 14:07:48.201849004 +0100
+@@ -283,16 +283,6 @@
+ AC_SUBST(XT_CFLAGS)
+ AC_SUBST(XT_LIBS)
+ 
+-dnl Check for libXp headers and libraries.
+-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no])
+-if test "x${XP_FOUND}" = xno
+-then
+-  AC_MSG_ERROR([Could not find Xp - \
+-  Try installing libXp-devel.])
+-fi
+-AC_SUBST(XP_CFLAGS)
+-AC_SUBST(XP_LIBS)
+-
+ dnl Check for libX11 headers and libraries.
+ PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
+ if test "x${X11_FOUND}" = xno