From 991f72d20c2bb031855a51792108efdc135f04fd Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 10 Mar 2013 12:03:13 +0100 Subject: openjdk6: add latest 1.12 icedtea version --- .../openjdk/openjdk-6-6b27/build-hacks.patch | 86 ++++++++++++++++++++++ .../openjdk-6-6b27/fix_hotspot_crosscompile.patch | 51 +++++++++++++ .../openjdk/openjdk-6-6b27/remove_libxp.patch | 21 ++++++ recipes-core/openjdk/openjdk-6-release-6b27.inc | 24 ++++++ recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb | 10 +++ 5 files changed, 192 insertions(+) create mode 100644 recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch create mode 100644 recipes-core/openjdk/openjdk-6-release-6b27.inc create mode 100644 recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb (limited to 'recipes-core') 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 diff --git a/recipes-core/openjdk/openjdk-6-release-6b27.inc b/recipes-core/openjdk/openjdk-6-release-6b27.inc new file mode 100644 index 0000000..32212df --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-release-6b27.inc @@ -0,0 +1,24 @@ +require openjdk-6-release-6b24.inc + +FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b27:" + +OEPATCHES += "file://remove_libxp.patch" + +OPENJDK_VERSION = "b27" +OPENJDK_DATE = "26_oct_2012" +SRC_URI[openjdk.md5sum] = "3a0963158e07c8829c8bd31a698bd23d" +SRC_URI[openjdk.sha256sum] = "044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0" + +CACAO_VERSION = "68fe50ac34ec" +SRC_URI[cacao.md5sum] = "d7607c455d36ba69651dfea38546922c" +SRC_URI[cacao.sha256sum] = "b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a" + +JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82" +SRC_URI[jamvm.md5sum] = "f4616713ec609e35aa8070811bd952aa" +SRC_URI[jamvm.sha256sum] = "bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03" + +JAXP_FILE = "jaxp144_04.zip" +SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd" +SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c" + + diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb new file mode 100644 index 0000000..da36da5 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb @@ -0,0 +1,10 @@ +require openjdk-6-release-6b27.inc + +PR = "${INC_PR}.0" + +SRC_URI[iced.md5sum] = "85bfc656c20fb762b72b71d3492a326c" +SRC_URI[iced.sha256sum] = "eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda" + +ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no" + +DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch" -- cgit v1.2.3-54-g00ecf