summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch86
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch51
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch21
-rw-r--r--recipes-core/openjdk/openjdk-6-release-6b27.inc24
-rw-r--r--recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb10
5 files changed, 192 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 @@
1Index: icedtea6-1.12.4/Makefile.am
2===================================================================
3--- icedtea6-1.12.4.orig/Makefile.am 2013-03-04 22:31:44.256894152 +0100
4+++ icedtea6-1.12.4/Makefile.am 2013-03-10 14:30:16.089527572 +0100
5@@ -656,6 +656,11 @@
6 JAVAC="" \
7 JAVA_HOME="" \
8 JDK_HOME="" \
9+ OE_CFLAGS="$(OE_CFLAGS)" \
10+ OE_CPPFLAGS="$(OE_CPPFLAGS)" \
11+ OE_CXXFLAGS="$(OE_CXXFLAGS)" \
12+ OE_LDFLAGS="$(OE_LDFLAGS)" \
13+ OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \
14 ANT_RESPECT_JAVA_HOME="TRUE" \
15 DISTRIBUTION_ID="$(DIST_ID)" \
16 DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
17@@ -2249,10 +2254,14 @@
18 if BUILD_JAMVM
19 cd jamvm/jamvm && \
20 LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
21- ./autogen.sh --with-java-runtime-library=openjdk6 \
22- --prefix=$(abs_top_builddir)/jamvm/install ; \
23- $(MAKE) ; \
24- $(MAKE) install
25+ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk6 \
26+ --prefix=$(abs_top_builddir)/jamvm/install \
27+ --host=$(host_alias) \
28+ --build=$(build_alias) \
29+ --target=$(target_alias) \
30+ --with-libtool-sysroot ; \
31+ $(ARCH_PREFIX) $(MAKE) ; \
32+ $(ARCH_PREFIX) $(MAKE) install
33 mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
34 cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
35 ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
36@@ -2316,6 +2325,7 @@
37 --host=$(host_alias) \
38 --build=$(build_alias) \
39 --target=$(target_alias) \
40+ --with-libtool-sysroot \
41 --prefix=$(abs_top_builddir)/cacao/install \
42 --with-java-runtime-library=openjdk \
43 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
44@@ -2384,7 +2394,7 @@
45 # configure script arguments, quoted in single quotes
46 CONFIGURE_ARGS = @CONFIGURE_ARGS@
47 ADD_ZERO_CONFIGURE_ARGS = \
48- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
49+ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
50 --enable-zero
51 if ADD_SHARK_BUILD
52 ADD_ZERO_CONFIGURE_ARGS += \
53Index: icedtea6-1.12.4/javac.in
54===================================================================
55--- icedtea6-1.12.4.orig/javac.in 2013-03-04 22:29:36.932613635 +0100
56+++ icedtea6-1.12.4/javac.in 2013-03-10 14:20:35.244778409 +0100
57@@ -18,7 +18,7 @@
58 {
59 my @new_args = @{$_[0]};
60
61- for my $opt (NO_DUP_ARGS)
62+ for my $opt (NO_DUP_ARGS)
63 {
64 my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
65 if (@indices > 1) {
66@@ -27,7 +27,7 @@
67 }
68 }
69
70- for my $opt (STRIP_ARGS)
71+ for my $opt (STRIP_ARGS)
72 {
73 my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
74 splice @new_args, $_, 1 for @indices;
75@@ -69,7 +69,10 @@
76 my @CLASSPATH = ('@ECJ_JAR@');
77 push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
78 $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
79- exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
80+
81+ # Compiling hotspot-tools consumes tons of memory and exceeds any default
82+ # limits for jamvm and cacao.
83+ exec '@JAVA@', '-Xmx1024m', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
84 }
85 else
86 {
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 @@
1Index: icedtea6-1.12.4/acinclude.m4
2===================================================================
3--- icedtea6-1.12.4.orig/acinclude.m4 2013-03-04 22:29:36.000000000 +0100
4+++ icedtea6-1.12.4/acinclude.m4 2013-03-10 13:45:56.032412186 +0100
5@@ -938,6 +938,21 @@
6 AC_SUBST(ALT_CACAO_SRC_DIR)
7 ])
8
9+AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD],
10+[
11+ AC_MSG_CHECKING(for compiler used for subsidiary programs)
12+ AC_ARG_WITH([cc-for-build],
13+ [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)],
14+ [
15+ CC_FOR_BUILD="${withval}"
16+ ],
17+ [
18+ CC_FOR_BUILD="\$(CC)"
19+ ])
20+ AC_MSG_RESULT(${CC_FOR_BUILD})
21+ AC_SUBST(CC_FOR_BUILD)
22+])
23+
24 AC_DEFUN([IT_WITH_GCJ],
25 [
26 AC_MSG_CHECKING([whether to compile ecj natively])
27Index: icedtea6-1.12.4/Makefile.am
28===================================================================
29--- icedtea6-1.12.4.orig/Makefile.am 2013-03-10 13:44:55.000000000 +0100
30+++ icedtea6-1.12.4/Makefile.am 2013-03-10 13:46:27.540523062 +0100
31@@ -656,6 +656,7 @@
32 JAVAC="" \
33 JAVA_HOME="" \
34 JDK_HOME="" \
35+ CC_FOR_BUILD="$(CC_FOR_BUILD)" \
36 OE_CFLAGS="$(OE_CFLAGS)" \
37 OE_CPPFLAGS="$(OE_CPPFLAGS)" \
38 OE_CXXFLAGS="$(OE_CXXFLAGS)" \
39Index: icedtea6-1.12.4/configure.ac
40===================================================================
41--- icedtea6-1.12.4.orig/configure.ac 2013-03-04 22:38:51.000000000 +0100
42+++ icedtea6-1.12.4/configure.ac 2013-03-10 13:45:56.032412186 +0100
43@@ -18,6 +18,8 @@
44 AC_PROG_CC
45 AC_PROG_CXX
46
47+AC_CHECK_WITH_CC_FOR_BUILD
48+
49 IT_FIND_TOOL([MAKE], [make])
50 IT_FIND_TOOL([GZIP], [gzip])
51 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 @@
1Index: icedtea6-1.12.4/configure.ac
2===================================================================
3--- icedtea6-1.12.4.orig/configure.ac 2013-03-10 14:04:34.072354787 +0100
4+++ icedtea6-1.12.4/configure.ac 2013-03-10 14:07:48.201849004 +0100
5@@ -283,16 +283,6 @@
6 AC_SUBST(XT_CFLAGS)
7 AC_SUBST(XT_LIBS)
8
9-dnl Check for libXp headers and libraries.
10-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no])
11-if test "x${XP_FOUND}" = xno
12-then
13- AC_MSG_ERROR([Could not find Xp - \
14- Try installing libXp-devel.])
15-fi
16-AC_SUBST(XP_CFLAGS)
17-AC_SUBST(XP_LIBS)
18-
19 dnl Check for libX11 headers and libraries.
20 PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
21 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 @@
1require openjdk-6-release-6b24.inc
2
3FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b27:"
4
5OEPATCHES += "file://remove_libxp.patch"
6
7OPENJDK_VERSION = "b27"
8OPENJDK_DATE = "26_oct_2012"
9SRC_URI[openjdk.md5sum] = "3a0963158e07c8829c8bd31a698bd23d"
10SRC_URI[openjdk.sha256sum] = "044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0"
11
12CACAO_VERSION = "68fe50ac34ec"
13SRC_URI[cacao.md5sum] = "d7607c455d36ba69651dfea38546922c"
14SRC_URI[cacao.sha256sum] = "b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a"
15
16JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82"
17SRC_URI[jamvm.md5sum] = "f4616713ec609e35aa8070811bd952aa"
18SRC_URI[jamvm.sha256sum] = "bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03"
19
20JAXP_FILE = "jaxp144_04.zip"
21SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd"
22SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c"
23
24
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 @@
1require openjdk-6-release-6b27.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[iced.md5sum] = "85bfc656c20fb762b72b71d3492a326c"
6SRC_URI[iced.sha256sum] = "eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda"
7
8ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no"
9
10DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 16:36:18 +0000