summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2015-10-16 19:29:38 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-10-19 10:12:53 -0200
commit2dcff5266a6c1ed39e49b24b8d2984a165ad9c35 (patch)
tree86757e1611e29bc17a3decf678f2c5e25c2ed0a6 /recipes-core/openjdk
parenta73939323984fca1e919d3408d3301ccdbceac9c (diff)
downloadmeta-java-2dcff5266a6c1ed39e49b24b8d2984a165ad9c35.tar.gz
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 <sno@netbsd.org> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch79
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch24
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/cacao-libtoolize.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch27
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch51
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-crosscompile-fix.patch270
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch16
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch23
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch15
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch21
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch28
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch39
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch65
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch41
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch61
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch148
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch14
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch113
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch18
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch41
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/jvm.cfg43
-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/icedtea-crosscompile-fix.patch469
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch34
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch119
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch280
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch25
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch16
-rw-r--r--recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch41
-rw-r--r--recipes-core/openjdk/openjdk-6-common.inc396
-rw-r--r--recipes-core/openjdk/openjdk-6-release-6b24.inc149
-rw-r--r--recipes-core/openjdk/openjdk-6-release-6b27.inc31
-rw-r--r--recipes-core/openjdk/openjdk-6-release-6b32.inc36
-rw-r--r--recipes-core/openjdk/openjdk-6/build-hacks.patch31
-rw-r--r--recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch18
-rw-r--r--recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch37
-rw-r--r--recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch94
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch229
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch131
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch23
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch15
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch21
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch28
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch39
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch41
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch148
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch29
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch14
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch18
-rw-r--r--recipes-core/openjdk/openjdk-6/jvm.cfg41
-rw-r--r--recipes-core/openjdk/openjdk-6/mkbc_returncode.patch11
-rw-r--r--recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch113
-rw-r--r--recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch20
-rw-r--r--recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb10
-rw-r--r--recipes-core/openjdk/openjdk-6_6b24_hg.bb12
-rw-r--r--recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb6
-rw-r--r--recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb6
75 files changed, 0 insertions, 4231 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch
deleted file mode 100644
index 8812cf2..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1Index: icedtea6/Makefile.am
2===================================================================
3--- icedtea6.orig/Makefile.am 2011-12-21 21:24:25.000000000 +0100
4+++ icedtea6/Makefile.am 2011-12-21 22:50:11.649227590 +0100
5@@ -538,6 +538,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 DISTRIBUTION_ID="$(DIST_ID)" \
15 DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
16 DEBUG_CLASSFILES="true" \
17@@ -1851,12 +1856,16 @@
18 if BUILD_JAMVM
19 cd jamvm/jamvm && \
20 LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
21- ./autogen.sh --with-java-runtime-library=openjdk \
22- --prefix=$(abs_top_builddir)/jamvm/install ; \
23- $(MAKE) ; \
24- $(MAKE) install
25+ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk \
26+ --prefix=/usr/lib \
27+ --host=$(host_alias) \
28+ --build=$(build_alias) \
29+ --target=$(target_alias) \
30+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
31+ $(ARCH_PREFIX) $(MAKE) ; \
32+ $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/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+ cp $(abs_top_builddir)/jamvm/install/usr/lib/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
36 ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
37 touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
38 ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
39@@ -1874,7 +1883,7 @@
40 stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp
41 if ADD_JAMVM_BUILD
42 mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm
43- install -m 644 jamvm/install/lib/libjvm.so \
44+ install -m 644 jamvm/install/usr/lib/lib/libjvm.so \
45 $(BUILD_JRE_ARCH_DIR)/jamvm/
46 printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
47 else
48@@ -1918,6 +1927,7 @@
49 --host=$(host_alias) \
50 --build=$(build_alias) \
51 --target=$(target_alias) \
52+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
53 --prefix=$(abs_top_builddir)/cacao/install \
54 --with-java-runtime-library=openjdk \
55 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
56@@ -1984,7 +1994,7 @@
57 # configure script arguments, quoted in single quotes
58 CONFIGURE_ARGS = @CONFIGURE_ARGS@
59 ADD_ZERO_CONFIGURE_ARGS = \
60- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
61+ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
62 --enable-zero
63 if ADD_SHARK_BUILD
64 ADD_ZERO_CONFIGURE_ARGS += \
65Index: icedtea6/javac.in
66===================================================================
67--- icedtea6.orig/javac.in 2011-12-21 21:24:30.000000000 +0100
68+++ icedtea6/javac.in 2011-12-21 22:44:25.860460813 +0100
69@@ -45,7 +45,9 @@
70 my @CLASSPATH = ('@ECJ_JAR@');
71 push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
72 $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
73- exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
74+ # Compiling hotspot-tools consumes tons of memory and exceeds any default
75+ # limits for jamvm and cacao.
76+ exec '@JAVA@', '-Xmx1024m', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
77 }
78 else
79 {
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch
deleted file mode 100644
index c21fcf1..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Index: cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c
2===================================================================
3--- cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c 2013-01-26 21:30:54.206581090 +0100
4+++ cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c 2013-01-26 21:31:34.406991316 +0100
5@@ -28,19 +28,7 @@
6
7 #include <stdint.h>
8
9-#define ucontext broken_glibc_ucontext
10-#define ucontext_t broken_glibc_ucontext_t
11 #include <ucontext.h>
12-#undef ucontext
13-#undef ucontext_t
14-
15-typedef struct ucontext {
16- unsigned long uc_flags;
17- struct ucontext *uc_link;
18- stack_t uc_stack;
19- struct sigcontext uc_mcontext;
20- sigset_t uc_sigmask;
21-} ucontext_t;
22
23 #define scontext_t struct sigcontext
24
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-libtoolize.patch
deleted file mode 100644
index 484cb10..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/cacao-libtoolize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: icedtea6/Makefile.am
2===================================================================
3--- icedtea6.orig/Makefile.am 2011-12-21 22:58:23.000000000 +0100
4+++ icedtea6/Makefile.am 2011-12-21 23:00:21.405887186 +0100
5@@ -1922,6 +1922,7 @@
6 if BUILD_CACAO
7 if !USE_SYSTEM_CACAO
8 cd cacao/cacao && \
9+ rm -f libtool && \
10 ./autogen.sh && \
11 $(ARCH_PREFIX) ./configure \
12 --host=$(host_alias) \
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch
deleted file mode 100644
index 95cb802..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea6-1.11.5/Makefile.am
2===================================================================
3--- icedtea6-1.11.5.orig/Makefile.am 2013-01-27 21:47:24.609119623 +0100
4+++ icedtea6-1.11.5/Makefile.am 2013-01-27 21:49:31.250516775 +0100
5@@ -1993,6 +1993,8 @@
6 if BUILD_CACAO
7 if !USE_SYSTEM_CACAO
8 cd cacao/cacao && \
9+ patch -p1 -N < $(abs_top_srcdir)/patches/cacao-loadavg.patch && \
10+ patch -p1 -N < $(abs_top_srcdir)/patches/cacao-arm-ucontext.patch && \
11 rm -f libtool && \
12 ./autogen.sh && \
13 $(ARCH_PREFIX) ./configure \
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch
deleted file mode 100644
index 0fc1a81..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Index: cacao-cff92704c4e0/src/vm/os.hpp
2===================================================================
3--- cacao-cff92704c4e0/src/vm/os.hpp 2011-12-08 13:40:45.000000000 +0100
4+++ cacao-cff92704c4e0/src/vm/os.hpp 2011-12-20 11:42:36.985633921 +0100
5@@ -425,7 +425,21 @@
6 #if defined(HAVE_GETLOADAVG)
7 return ::getloadavg(loadavg, nelem);
8 #else
9-# error getloadavg not available
10+ FILE *LOADAVG;
11+ double avg[3] = { 0.0, 0.0, 0.0 };
12+ int i, res = -1;;
13+
14+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
15+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
16+ res = 0;
17+ fclose(LOADAVG);
18+ }
19+
20+ for (i = 0; (i < nelem) && (i < 3); i++) {
21+ loadavg[i] = avg[i];
22+ }
23+
24+ return res;
25 #endif
26 }
27
diff --git a/recipes-core/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch
deleted file mode 100644
index bef699f..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1Index: icedtea6/acinclude.m4
2===================================================================
3--- icedtea6.orig/acinclude.m4 2011-12-20 02:25:50.000000000 +0100
4+++ icedtea6/acinclude.m4 2011-12-20 18:02:08.340386576 +0100
5@@ -928,6 +928,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/Makefile.am
28===================================================================
29--- icedtea6.orig/Makefile.am 2011-12-20 17:59:27.000000000 +0100
30+++ icedtea6/Makefile.am 2011-12-20 18:04:32.972312064 +0100
31@@ -538,6 +538,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/configure.ac
40===================================================================
41--- icedtea6.orig/configure.ac 2011-12-20 02:25:50.000000000 +0100
42+++ icedtea6/configure.ac 2011-12-20 18:03:04.534043885 +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-6b24/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-crosscompile-fix.patch
deleted file mode 100644
index f268290..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-crosscompile-fix.patch
+++ /dev/null
@@ -1,270 +0,0 @@
1Index: openjdk/jdk/make/sun/awt/Makefile
2===================================================================
3--- openjdk.orig/jdk/make/sun/awt/Makefile 2009-01-24 17:54:57.000000000 +0100
4+++ openjdk/jdk/make/sun/awt/Makefile 2009-01-24 17:55:07.000000000 +0100
5@@ -509,10 +509,10 @@
6 #
7
8 ifeq ($(PLATFORM), linux)
9-CPPFLAGS += -I$(MOTIF_DIR)/include \
10- -I$(OPENWIN_HOME)/include \
11- -I$(OPENWIN_HOME)/include/X11/extensions \
12- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
13+#CPPFLAGS += -I$(MOTIF_DIR)/include \
14+# -I$(OPENWIN_HOME)/include \
15+# -I$(OPENWIN_HOME)/include/X11/extensions \
16+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
17 endif
18 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
19 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
20@@ -536,7 +536,7 @@
21 $(EVENT_MODEL)
22
23 ifeq ($(PLATFORM), linux)
24-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
25+#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
26 endif
27
28 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
29Index: openjdk/jdk/make/sun/awt/mawt.gmk
30===================================================================
31--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:54:57.000000000 +0100
32+++ openjdk/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:55:07.000000000 +0100
33@@ -194,8 +194,8 @@
34 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
35
36 ifndef HEADLESS
37-CPPFLAGS += -I$(OPENWIN_HOME)/include
38-LDFLAGS += -L$(OPENWIN_LIB)
39+#CPPFLAGS += -I$(OPENWIN_HOME)/include
40+#LDFLAGS += -L$(OPENWIN_LIB)
41
42 endif # !HEADLESS
43
44@@ -223,8 +223,8 @@
45
46 ifeq ($(PLATFORM), linux)
47 # Checking for the X11/extensions headers at the additional location
48- CPPFLAGS += -I/X11R6/include/X11/extensions \
49- -I/usr/include/X11/extensions
50+# CPPFLAGS += -I/X11R6/include/X11/extensions \
51+# -I/usr/include/X11/extensions
52 endif
53
54 ifeq ($(PLATFORM), solaris)
55Index: openjdk/jdk/make/sun/xawt/Makefile
56===================================================================
57--- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-01-24 17:54:57.000000000 +0100
58+++ openjdk/jdk/make/sun/xawt/Makefile 2009-01-24 17:55:07.000000000 +0100
59@@ -123,11 +123,12 @@
60 -I$(PLATFORM_SRC)/native/sun/awt
61
62 ifeq ($(PLATFORM), linux)
63+# Very unsuitable for cross-compilation.
64 # Allows for builds on Debian GNU Linux, X11 is in a different place
65- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
66- -I/usr/include/X11/extensions \
67- -I$(MOTIF_DIR)/include \
68- -I$(OPENWIN_HOME)/include
69+# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
70+# -I/usr/include/X11/extensions \
71+# -I$(MOTIF_DIR)/include \
72+# -I$(OPENWIN_HOME)/include
73 endif
74
75 ifeq ($(PLATFORM), solaris)
76Index: openjdk/hotspot/make/linux/makefiles/vm.make
77===================================================================
78--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:54:57.000000000 +0100
79+++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:55:07.000000000 +0100
80@@ -170,6 +170,7 @@
81 LIBS_VM += $(LLVM_LIBS)
82 endif
83
84+LFLAGS_VM += $(OE_LDFLAGS)
85 LINK_VM = $(LINK_LIB.c)
86
87 # rule for building precompiled header
88Index: openjdk/hotspot/make/linux/makefiles/buildtree.make
89===================================================================
90--- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:54:57.000000000 +0100
91+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:55:07.000000000 +0100
92@@ -343,7 +343,7 @@
93 echo "rm -f Queens.class"; \
94 echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
95 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
96- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
97+ echo 'echo Silently skipping the execution of the gamma program'; \
98 ) > $@
99 $(QUIETLY) chmod +x $@
100
101Index: openjdk/corba/make/common/Defs-linux.gmk
102===================================================================
103--- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100
104+++ openjdk/corba/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100
105@@ -82,9 +82,9 @@
106 CC_NO_OPT =
107
108 ifeq ($(PRODUCT), java)
109- _OPT = $(CC_HIGHER_OPT)
110+ _OPT = $(OE_CFLAGS)
111 else
112- _OPT = $(CC_LOWER_OPT)
113+ _OPT = $(OE_CFLAGS)
114 CPPFLAGS_DBG += -DLOGGING
115 endif
116
117@@ -94,7 +94,7 @@
118 # as the default.
119 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
120 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
121-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
122+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
123 CFLAGS_REQUIRED_hppa +=
124 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
125 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
126@@ -221,7 +221,7 @@
127 #
128 # -L paths for finding and -ljava
129 #
130-LDFLAGS_OPT = -Xlinker -O1
131+LDFLAGS_OPT = $(OE_LDFLAGS)
132 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
133 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
134
135Index: openjdk/jdk/make/common/Defs-linux.gmk
136===================================================================
137--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100
138+++ openjdk/jdk/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100
139@@ -92,9 +92,9 @@
140 CC_NO_OPT =
141
142 ifeq ($(PRODUCT), java)
143- _OPT = $(CC_HIGHER_OPT)
144+ _OPT = $(OE_CFLAGS)
145 else
146- _OPT = $(CC_LOWER_OPT)
147+ _OPT = $(OE_CFLAGS)
148 CPPFLAGS_DBG += -DLOGGING
149 endif
150
151@@ -104,7 +104,7 @@
152 # as the default.
153 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
154 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
155-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
156+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
157 CFLAGS_REQUIRED_hppa +=
158 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
159 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
160@@ -231,7 +231,7 @@
161 #
162 # -L paths for finding and -ljava
163 #
164-LDFLAGS_OPT = -Xlinker -O1
165+LDFLAGS_OPT = $(OE_LDFLAGS)
166 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
167 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
168
169Index: openjdk/hotspot/make/linux/makefiles/gcc.make
170===================================================================
171--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:54:57.000000000 +0100
172+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:55:07.000000000 +0100
173@@ -119,7 +119,7 @@
174 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
175
176 # The flags to use for an Optimized g++ build
177-OPT_CFLAGS += -O3
178+OPT_CFLAGS += $(OE_CFLAGS)
179
180 # Hotspot uses very unstrict aliasing turn this optimization off
181 OPT_CFLAGS += -fno-strict-aliasing
182@@ -148,7 +148,7 @@
183 endif
184
185 # Enable linker optimization
186-LFLAGS += -Xlinker -O1
187+LFLAGS += $(OE_LDFLAGS)
188
189 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
190 MAPFLAG = -Xlinker --version-script=FILENAME
191Index: openjdk/hotspot/make/linux/makefiles/launcher.make
192===================================================================
193--- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:55:19.000000000 +0100
194+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:56:05.000000000 +0100
195@@ -44,7 +44,7 @@
196 LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
197 else
198 LAUNCHER.o = launcher.o
199- LFLAGS_LAUNCHER += -L `pwd`
200+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS)
201 LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
202 endif
203
204Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile
205===================================================================
206--- openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:17:03.926207269 +0100
207+++ openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:30:11.956186631 +0100
208@@ -245,7 +245,7 @@
209 $(CHMOD) +w $@;\
210 else \
211 $(ECHO) GENERATING $@; \
212- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
213+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
214 fi
215 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
216 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
217diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher
218index f59a9d6..6edc880 100644
219--- openjdk/jdk/make/launchers/Makefile.launcher
220+++ openjdk/jdk/make/launchers/Makefile.launcher
221@@ -152,7 +152,7 @@ endif
222 ifeq ($(GUI_TOOL),true)
223 ifneq ($(PLATFORM), windows)
224 # Anything with a GUI needs X11 to be linked in.
225- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
226+ OTHER_LDLIBS += -lX11
227 endif
228 endif
229
230diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
231index 2021434..9035da7 100644
232--- openjdk/jdk/make/sun/jawt/Makefile
233+++ openjdk/jdk/make/sun/jawt/Makefile
234@@ -98,8 +98,7 @@ else # PLATFORM
235 #
236 # Other extra flags needed for compiling.
237 #
238-CPPFLAGS += -I$(OPENWIN_HOME)/include \
239- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
240+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
241 -I$(SHARE_SRC)/native/$(PKGDIR)/image \
242 -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
243 -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
244diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
245index 6693e2a..58d05f1 100644
246--- openjdk/jdk/make/sun/splashscreen/Makefile
247+++ openjdk/jdk/make/sun/splashscreen/Makefile
248@@ -63,8 +63,7 @@ CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
249
250 ifneq ($(PLATFORM), windows)
251 CFLAGS += -DWITH_X11
252- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
253- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
254+ OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
255 else # PLATFORM
256 CFLAGS += -DWITH_WIN32
257 OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
258diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
259index 440699b..ffa177d 100644
260--- openjdk/jdk/make/sun/xawt/Makefile
261+++ openjdk/jdk/make/sun/xawt/Makefile
262@@ -46,8 +46,6 @@ include FILES_export_unix.gmk
263 AUTO_FILES_JAVA_DIRS = sun/awt/X11
264 AUTO_JAVA_PRUNE = WrapperGenerator.java
265
266-LDFLAGS += -L$(OPENWIN_LIB)
267-
268 # For Xrender extension.
269 ifeq ($(PLATFORM), solaris)
270 LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR)
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch
deleted file mode 100644
index 4bd8b2c..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
2===================================================================
3--- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2011-10-19 16:56:03.014276748 +0200
4+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2011-10-19 16:57:19.942658211 +0200
5@@ -29,7 +29,7 @@
6 #include "X11SurfaceData.h"
7
8 /*#include <xcb/xcb.h>*/
9-#include <Xrender.h>
10+#include <X11/extensions/Xrender.h>
11
12 #ifndef RepeatNone /* added in 0.10 */
13 #define RepeatNone 0
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch
deleted file mode 100644
index 5f2c98b..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/rules.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:22:33.201668748 +0100
4+++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:23:08.480415783 +0100
5@@ -39,6 +39,7 @@
6 # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
7 C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
8 CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
9+CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS)
10
11 AS.S = $(AS) $(ASFLAGS)
12
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch
deleted file mode 100644
index 657f722..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Index: openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-12-20 19:15:05.000000000 +0100
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-12-20 19:18:22.411503442 +0100
5@@ -2593,10 +2593,7 @@
6 // If we are running with earlier version, which did not have symbol versions,
7 // we should use the base version.
8 void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
9- void *f = dlvsym(handle, name, "libnuma_1.1");
10- if (f == NULL) {
11- f = dlsym(handle, name);
12- }
13+ void *f = dlsym(handle, name);
14 return f;
15 }
16
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch
deleted file mode 100644
index faa90ea..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200
5@@ -49,7 +49,6 @@
6 # include <string.h>
7 # include <syscall.h>
8 # include <sys/sysinfo.h>
9-# include <gnu/libc-version.h>
10 # include <sys/ipc.h>
11 # include <sys/shm.h>
12 # include <link.h>
13@@ -544,9 +543,7 @@
14 os::Linux::set_glibc_version(str);
15 } else {
16 // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
17- static char _gnu_libc_version[32];
18- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
19- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
20+ static char _gnu_libc_version[32] = "2.9";
21 os::Linux::set_glibc_version(_gnu_libc_version);
22 }
23
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch
deleted file mode 100644
index 7c5da59..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
2===================================================================
3--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:28.576131825 +0200
4+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:55.555711815 +0200
5@@ -235,8 +235,8 @@
6
7 // Checking for finiteness
8
9-inline int g_isfinite(jfloat f) { return finite(f); }
10-inline int g_isfinite(jdouble f) { return finite(f); }
11+inline int g_isfinite(jfloat f) { return isfinite(f); }
12+inline int g_isfinite(jdouble f) { return isfinite(f); }
13
14
15 // Wide characters
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch
deleted file mode 100644
index 494e965..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
2===================================================================
3--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:47:12.695674808 +0200
4+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:48:08.699007491 +0200
5@@ -220,14 +220,14 @@
6 // checking for nanness
7 #ifdef SOLARIS
8 #ifdef SPARC
9-inline int g_isnan(float f) { return isnanf(f); }
10+inline int g_isnan(float f) { return __isnanf(f); }
11 #else
12 // isnanf() broken on Intel Solaris use isnand()
13 inline int g_isnan(float f) { return isnand(f); }
14 #endif
15 inline int g_isnan(double f) { return isnand(f); }
16 #elif LINUX
17-inline int g_isnan(float f) { return isnanf(f); }
18+inline int g_isnan(float f) { return __isnanf(f); }
19 inline int g_isnan(double f) { return isnan(f); }
20 #else
21 #error "missing platform-specific definition here"
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch
deleted file mode 100644
index 7da41fd..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200
5@@ -4325,7 +4325,22 @@
6 // Linux doesn't yet have a (official) notion of processor sets,
7 // so just return the system wide load average.
8 int os::loadavg(double loadavg[], int nelem) {
9- return ::getloadavg(loadavg, nelem);
10+
11+ FILE *LOADAVG;
12+ double avg[3] = { 0.0, 0.0, 0.0 };
13+ int i, res = -1;;
14+
15+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
16+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
17+ res = 0;
18+ fclose(LOADAVG);
19+ }
20+
21+ for (i = 0; (i < nelem) && (i < 3); i++) {
22+ loadavg[i] = avg[i];
23+ }
24+
25+ return res;
26 }
27
28 void os::pause() {
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch
deleted file mode 100644
index 68f8581..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Index: openjdk/jdk/make/java/npt/Makefile
2===================================================================
3--- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200
4+++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200
5@@ -65,6 +65,8 @@
6 # We don't want to link against -ljava
7 JAVALIB=
8
9+LDLIBS += -liconv
10+
11 # Add -export options to explicitly spell exported symbols
12 ifeq ($(PLATFORM), windows)
13 OTHER_LCF += -export:nptInitialize -export:nptTerminate
14Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile
15===================================================================
16--- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200
17+++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200
18@@ -123,6 +123,8 @@
19 # We don't want to link against -ljava
20 JAVALIB=
21
22+LDLIBS += -liconv
23+
24 #
25 # Add to ambient vpath so we pick up the library files
26 #
27Index: openjdk/jdk/make/sun/splashscreen/Makefile
28===================================================================
29--- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200
30+++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200
31@@ -55,6 +55,8 @@
32
33 JAVALIB=
34
35+LDLIBS += -liconv
36+
37 #
38 # C Flags
39 #
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch
deleted file mode 100644
index cc5e4e8..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1http://mail.openjdk.java.net/pipermail/zero-dev/2010-June/000346.html
2
3this cute C code does the same thing on powerpc as the assembly code that
4was here before. If the compiler was built with the SPE extensions instead
5of traditional FPU and double operations are performed in HW then we are
6one step further: The compiler turns this into evldd & evstdd. Voila :)
7
8This C code could also be activated on s390. The compiler turns this into
9a single mvc instruction which does the copy operation. I don't know if
10mvc's copy ability is atomic _or_ not and therefore I leave it as it.
11
12Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
13
14./openjdk-src-dir/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
15Index: openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
16===================================================================
17--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp.org 2011-11-14 14:07:32.000000000 -0800
18+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2012-07-19 07:28:26.208405923 -0700
19@@ -25,6 +25,16 @@
20
21 #ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
22 #define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
23+#if defined(PPC) && !defined(_LP64)
24+
25+#ifndef __NO_FPRS__
26+#define ATOMIC64_COPY_THROUGH_DOUBLE 1
27+
28+#elif defined(__SPE__) && !defined(_SOFT_DOUBLE)
29+#define ATOMIC64_COPY_THROUGH_DOUBLE 1
30+
31+#endif
32+#endif
33
34 static void setup_fpu() {}
35
36@@ -36,12 +46,23 @@
37
38 // Atomically copy 64 bits of data
39 static void atomic_copy64(volatile void *src, volatile void *dst) {
40-#if defined(PPC) && !defined(_LP64)
41- double tmp;
42- asm volatile ("lfd %0, 0(%1)\n"
43- "stfd %0, 0(%2)\n"
44- : "=f"(tmp)
45- : "b"(src), "b"(dst));
46+#if ATOMIC64_COPY_THROUGH_DOUBLE
47+ /*
48+ * In order to copy 8 bytes atomicly we rely on the trick that some
49+ * architectures can load and store a double as a single operation.
50+ * gcc picks the correct opcode here and with optimization turned on
51+ * all temporary assignments are gone. - bigeasy
52+ */
53+ union {
54+ double *d;
55+ volatile void *v;
56+ } s, d;
57+
58+ s.v = src;
59+ d.v = dst;
60+
61+ *d.d = *s.d;
62+
63 #elif defined(S390) && !defined(_LP64)
64 double tmp;
65 asm volatile ("ld %0, 0(%1)\n"
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch
deleted file mode 100644
index 5423fde..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
2===================================================================
3--- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200
4+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200
5@@ -27,9 +27,6 @@
6 #include <X11/Xutil.h>
7 #include <X11/Xos.h>
8 #include <X11/Xatom.h>
9-#ifdef __linux__
10-#include <execinfo.h>
11-#endif
12
13 #include <jvm.h>
14 #include <jni.h>
15@@ -689,26 +686,6 @@
16 return ret;
17 }
18
19-#ifdef __linux__
20-void print_stack(void)
21-{
22- void *array[10];
23- size_t size;
24- char **strings;
25- size_t i;
26-
27- size = backtrace (array, 10);
28- strings = backtrace_symbols (array, size);
29-
30- fprintf (stderr, "Obtained %zd stack frames.\n", size);
31-
32- for (i = 0; i < size; i++)
33- fprintf (stderr, "%s\n", strings[i]);
34-
35- free (strings);
36-}
37-#endif
38-
39 Window get_xawt_root_shell(JNIEnv *env) {
40 static jclass classXRootWindow = NULL;
41 static jmethodID methodGetXRootWindow = NULL;
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch
deleted file mode 100644
index acd3e1e..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile
2index bdc1f8f..76f0c00 100644
3--- openjdk/jdk/make/com/sun/jmx/Makefile
4+++ openjdk/jdk/make/com/sun/jmx/Makefile
5@@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/
6 # when available, we need to run with latest rmic version available. rmic
7 # launch tool not built at this stage but we can invoke via rmi class.
8
9-RMIC_JAVA = $(OUTPUTDIR)/bin/java
10+RMIC_JAVA = $(BOOTDIR)/bin/java
11 # need to treat 64bit solaris differently
12 ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
13 RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch
deleted file mode 100644
index 54d6a19..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1Disable xawt and jawt along with sizes generation which does not work well if
2you cant generated sizes in cross env. So for architectures which dont have
3working qemu this is an option
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Inappropriate [Cross-compile specific hack]
7
8--- openjdk/jdk/make/sun/xawt/Makefile.khem 2012-07-21 23:54:47.396405922 -0700
9+++ openjdk/jdk/make/sun/xawt/Makefile 2012-07-21 23:55:52.032405922 -0700
10@@ -245,18 +245,19 @@
11 $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
12
13 $(SIZES): $(SIZERS)
14- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
15- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
16- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
17- $(CHMOD) +w $@;\
18- else \
19- $(ECHO) GENERATING $@; \
20- $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
21- fi
22- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
23- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
24- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
25- fi
26+ touch $(SIZES)
27+# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
28+# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
29+# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
30+# $(CHMOD) +w $@;\
31+# else \
32+# $(ECHO) GENERATING $@; \
33+# $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
34+# fi
35+# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
36+# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
37+# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
38+# fi
39
40 $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
41 $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
42--- openjdk/jdk/make/sun/Makefile.khem 2011-11-14 14:11:40.000000000 -0800
43+++ openjdk/jdk/make/sun/Makefile 2012-07-22 00:42:04.980409296 -0700
44@@ -50,7 +50,7 @@
45 MOTIF_SUBDIRS = motif12 motif21
46 endif
47 HEADLESS_SUBDIR = headless
48- XAWT_SUBDIR = xawt
49+ XAWT_SUBDIR =
50 endif
51
52 ifndef OPENJDK
53@@ -65,7 +65,7 @@
54 awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
55 $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
56 font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
57- jawt text nio launcher management $(ORG_SUBDIR) \
58+ text nio launcher management $(ORG_SUBDIR) \
59 native2ascii serialver tools jconsole
60
61 all build clean clobber::
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch
deleted file mode 100644
index 40564f0..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: openjdk/jdk/make/com/sun/java/pack/Makefile
2===================================================================
3--- openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:21.548426411 +0200
4+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:43.858007543 +0200
5@@ -103,6 +103,7 @@
6 OTHER_LDLIBS += $(LIBCXX) -lc
7 # setup the list of libraries to link in...
8 ifeq ($(PLATFORM), linux)
9+ OTHER_LDLIBS += -lpthread
10 ifeq ("$(CC_VER_MAJOR)", "3")
11 OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
12 endif
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
deleted file mode 100644
index b97745d..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/launcher.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/launcher.make 2011-12-20 10:33:37.000000000 +0100
4+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2011-12-20 10:37:54.055022618 +0100
5@@ -51,7 +51,7 @@
6 else
7 LAUNCHER.o = launcher.o
8 LFLAGS_LAUNCHER += -L `pwd`
9- LIBS_LAUNCHER += -l$(JVM) $(LIBS)
10+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
11 ifeq ($(SHARK_BUILD), true)
12 LFLAGS_LAUNCHER += $(LLVM_LDFLAGS)
13 LIBS_LAUNCHER += $(LLVM_LIBS)
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch
deleted file mode 100644
index 024969d..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1Index: openjdk/jdk/make/java/net/Makefile
2===================================================================
3--- openjdk/jdk/make/java/net/Makefile 2010-07-05 12:28:58.476625401 +0200
4+++ openjdk/jdk/make/java/net/Makefile 2010-07-05 12:29:11.876625138 +0200
5@@ -25,7 +25,7 @@
6
7 BUILDDIR = ../..
8 PACKAGE = java.net
9-LIBRARY = net
10+LIBRARY = javanet
11 PRODUCT = sun
12 include $(BUILDDIR)/common/Defs.gmk
13
14Index: openjdk/jdk/make/java/nio/Makefile
15===================================================================
16--- openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:31:27.046626250 +0200
17+++ openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:32:06.647874890 +0200
18@@ -139,11 +139,11 @@
19 endif
20 ifeq ($(PLATFORM), linux)
21 COMPILER_WARNINGS_FATAL=true
22-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
23+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
24 endif
25 ifeq ($(PLATFORM), solaris)
26 OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
27- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
28+ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
29 endif # PLATFORM
30
31 #
32Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
33===================================================================
34--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200
35+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200
36@@ -58,7 +58,7 @@
37 */
38 static {
39 java.security.AccessController.doPrivileged(
40- new sun.security.action.LoadLibraryAction("net"));
41+ new sun.security.action.LoadLibraryAction("javanet"));
42 }
43
44 /**
45Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
46===================================================================
47--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200
48+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200
49@@ -74,7 +74,7 @@
50 */
51 static {
52 java.security.AccessController.doPrivileged(
53- new sun.security.action.LoadLibraryAction("net"));
54+ new sun.security.action.LoadLibraryAction("javanet"));
55 }
56
57 /**
58Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
59===================================================================
60--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200
61+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200
62@@ -47,7 +47,7 @@
63 */
64 static {
65 java.security.AccessController.doPrivileged(
66- new sun.security.action.LoadLibraryAction("net"));
67+ new sun.security.action.LoadLibraryAction("javanet"));
68 init();
69 }
70
71Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java
72===================================================================
73--- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200
74+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200
75@@ -230,7 +230,7 @@
76 static {
77 preferIPv6Address = java.security.AccessController.doPrivileged(
78 new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
79- AccessController.doPrivileged(new LoadLibraryAction("net"));
80+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
81 init();
82 }
83
84Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
85===================================================================
86--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200
87+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200
88@@ -52,7 +52,7 @@
89 private boolean virtual = false;
90
91 static {
92- AccessController.doPrivileged(new LoadLibraryAction("net"));
93+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
94 init();
95 }
96
97Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
98===================================================================
99--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200
100+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200
101@@ -89,7 +89,7 @@
102 }});
103 if (b != null && b.booleanValue()) {
104 java.security.AccessController.doPrivileged(
105- new sun.security.action.LoadLibraryAction("net"));
106+ new sun.security.action.LoadLibraryAction("javanet"));
107 hasSystemProxies = init();
108 }
109 }
110Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/share/classes/sun/nio/ch/Util.java
111===================================================================
112--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200
113+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200
114@@ -354,7 +354,7 @@
115 return;
116 loaded = true;
117 java.security.AccessController
118- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
119+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
120 java.security.AccessController
121 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
122 // IOUtil must be initialized; Its native methods are called from
123Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
124===================================================================
125--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200
126+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200
127@@ -244,7 +244,7 @@
128
129 static {
130 java.security.AccessController.doPrivileged(
131- new sun.security.action.LoadLibraryAction("net"));
132+ new sun.security.action.LoadLibraryAction("javanet"));
133 }
134
135 }
136Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
137===================================================================
138--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200
139+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200
140@@ -160,7 +160,7 @@
141
142 static {
143 java.security.AccessController.doPrivileged(
144- new sun.security.action.LoadLibraryAction("net"));
145+ new sun.security.action.LoadLibraryAction("javanet"));
146 init0();
147
148 // start the address listener thread
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch
deleted file mode 100644
index f2ad035..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/gcc.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:35.758533706 +0100
4+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:42.761456458 +0100
5@@ -98,9 +98,6 @@
6 CFLAGS += -pipe
7 endif
8
9-# Compiler warnings are treated as errors
10-WARNINGS_ARE_ERRORS = -Werror
11-
12 # Except for a few acceptable ones
13 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
14 # conversions which might affect the values. To avoid that, we need to turn
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch
deleted file mode 100644
index f40bc51..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch
+++ /dev/null
@@ -1,113 +0,0 @@
1Index: openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp
2===================================================================
3--- openjdk.orig/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200
4+++ openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:50:51.680282178 +0200
5@@ -32,6 +32,96 @@
6
7 #if SHARK_LLVM_VERSION >= 27
8 namespace {
9+
10+#if defined(__arm__) && defined(__linux__)
11+#include <fcntl.h>
12+#include <linux/auxvec.h>
13+#include <asm/hwcap.h>
14+#define VECBUFF_SIZE 32
15+
16+bool TestARMLinuxHWCAP(int feature) {
17+ int fd;
18+ unsigned vecs[VECBUFF_SIZE];
19+ unsigned *p;
20+ int i, n;
21+ int rc;
22+
23+ rc = 0;
24+ fd = open("/proc/self/auxv", O_RDONLY);
25+ if (fd < 0) return 0;
26+ do {
27+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
28+ p = vecs;
29+ i = n/8;
30+ while (--i >=0) {
31+ unsigned tag = *p++;
32+ unsigned value = *p++;
33+ if (tag == 0) goto fini;
34+ if(tag == AT_HWCAP && (value & feature)) {
35+ rc = 1;
36+ goto fini;
37+ }
38+ }
39+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
40+fini:
41+ close(fd);
42+ return rc;
43+}
44+
45+char* TestARMLinuxAT(int auxvec) {
46+ int fd;
47+ unsigned vecs[VECBUFF_SIZE];
48+ unsigned *p;
49+ int i, n;
50+ char* rc;
51+
52+ rc = 0;
53+ fd = open("/proc/self/auxv", O_RDONLY);
54+ if (fd < 0) return 0;
55+ do {
56+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
57+ p = vecs;
58+ i = n/8;
59+ while (--i >=0) {
60+ unsigned tag = *p++;
61+ unsigned value = *p++;
62+ if (tag == 0) goto fini;
63+ if(tag == (unsigned) auxvec ) {
64+ rc = (char*)value;
65+ goto fini;
66+ }
67+ }
68+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
69+fini:
70+ close(fd);
71+ return rc;
72+}
73+
74+bool getARMHostCPUFeatures(StringMap<bool> &Features) {
75+ // FIXME LLVM PR6561 // Features["neon"]=TestARMLinuxHWCAP(HWCAP_NEON);
76+ Features["thumb2"]=TestARMLinuxHWCAP(HWCAP_THUMBEE);
77+ Features["vfp2"]=TestARMLinuxHWCAP(HWCAP_VFP);
78+
79+ std::string testArchKey(TestARMLinuxAT(AT_PLATFORM));
80+
81+ StringMap<std::string> archLinuxToLLVMMap;
82+ archLinuxToLLVMMap["v4l"]="v4t";
83+ archLinuxToLLVMMap["v5l"]="v5t";
84+ archLinuxToLLVMMap["v6l"]="v6";
85+ // FIXME change this from v6 to v7a when LLVM PR7048 have been fixed
86+ archLinuxToLLVMMap["v7l"]="v6";
87+
88+ llvm::StringMapIterator<std::string> resultIterator(archLinuxToLLVMMap.find(
89+ testArchKey));
90+ if(resultIterator->first()) {
91+ std::string arch(resultIterator->second);
92+ Features[arch]=true;
93+ }
94+
95+ return true;
96+}
97+#endif
98+
99 cl::opt<std::string>
100 MCPU("mcpu");
101
102@@ -64,7 +154,11 @@
103 #if SHARK_LLVM_VERSION >= 27
104 // Finetune LLVM for the current host CPU.
105 StringMap<bool> Features;
106+#if defined(__arm__) && defined(__linux__)
107+ bool gotCpuFeatures = getARMHostCPUFeatures(Features);
108+#else
109 bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features);
110+#endif
111 std::string cpu("-mcpu=" + llvm::sys::getHostCPUName());
112
113 std::vector<const char*> args;
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch
deleted file mode 100644
index 9f875de..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
2===================================================================
3--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100
4+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100
5@@ -27,13 +27,11 @@
6
7 #include "jfdlibm.h"
8
9-#ifdef __NEWVALID /* special setup for Sun test regime */
10 #if defined(i386) || defined(i486) || \
11 defined(intel) || defined(x86) || \
12 defined(i86pc) || defined(_M_IA64) || defined(ia64)
13 #define _LITTLE_ENDIAN
14 #endif
15-#endif
16
17 #ifdef _LITTLE_ENDIAN
18 #define __HI(x) *(1+(int*)&x)
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch
deleted file mode 100644
index ba738d6..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/zeroshark.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/zeroshark.make 2011-12-20 18:24:38.000000000 +0100
4+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2011-12-20 18:31:22.584884637 +0100
5@@ -32,13 +32,20 @@
6 Obj_Files += thumb2.o
7
8 CFLAGS += -DHOTSPOT_ASM
9+CCFLAGS += -DHOTSPOT_ASM
10+
11+ifeq ($(CROSS_COMPILATION), true)
12+ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD)
13+else
14+ C_COMPILE_FOR_MKBC = $(C_COMPILE)
15+endif
16
17 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
18 thumb2.o: offsets_arm.s
19
20 offsets_arm.s: mkoffsets
21 @echo Generating assembler offsets
22- ./mkoffsets > $@
23+ $(QEMU) ./mkoffsets > $@
24
25 bytecodes_arm.s: bytecodes_arm.def mkbc
26 @echo Generatine ARM assembler bytecode sequences
27@@ -46,12 +53,12 @@
28
29 mkbc: $(GAMMADIR)/tools/mkbc.c
30 @echo Compiling mkbc tool
31- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
32+ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE)
33
34 mkoffsets: asm_helper.cpp
35 @echo Compiling offset generator
36 $(QUIETLY) $(REMOVE_TARGET)
37- $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
38+ $(CC_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
39
40 endif
41
diff --git a/recipes-core/openjdk/openjdk-6-6b24/jvm.cfg b/recipes-core/openjdk/openjdk-6-6b24/jvm.cfg
deleted file mode 100644
index ea97cda..0000000
--- a/recipes-core/openjdk/openjdk-6-6b24/jvm.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
1# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
2# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3#
4# This code is free software; you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 2 only, as
6# published by the Free Software Foundation. Sun designates this
7# particular file as subject to the "Classpath" exception as provided
8# by Sun in the LICENSE file that accompanied this code.
9#
10# This code is distributed in the hope that it will be useful, but WITHOUT
11# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13# version 2 for more details (a copy is included in the LICENSE file that
14# accompanied this code).
15#
16# You should have received a copy of the GNU General Public License version
17# 2 along with this work; if not, write to the Free Software Foundation,
18# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19#
20# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
21# CA 95054 USA or visit www.sun.com if you need additional information or
22# have any questions.
23#
24#
25# List of JVMs that can be used as an option to java, javac, etc.
26# Order is important -- first in this list is the default JVM.
27# NOTE that this both this file and its format are UNSUPPORTED and
28# WILL GO AWAY in a future release.
29#
30# You may also select a JVM in an arbitrary location with the
31# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
32# and may not be available in a future release.
33#
34-server ERROR
35-client IGNORE
36-hotspot ERROR
37-classic WARN
38-native ERROR
39-green ERROR
40-zero ALIASED_TO -server
41-shark ERROR
42-cacao ERROR
43-jamvm ERROR
diff --git a/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
deleted file mode 100644
index 1ecdef6..0000000
--- a/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
+++ /dev/null
@@ -1,86 +0,0 @@
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=${ALT_FREETYPE_LIB_PATH} ; \
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=${ALT_FREETYPE_LIB_PATH} \
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
deleted file mode 100644
index 9741ed0..0000000
--- a/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
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/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch
deleted file mode 100644
index 0723954..0000000
--- a/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch
+++ /dev/null
@@ -1,469 +0,0 @@
1diff --git openjdk/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
2index f308203..5ba15dc 100644
3--- openjdk/corba/make/common/Defs-linux.gmk
4+++ openjdk/corba/make/common/Defs-linux.gmk
5@@ -82,9 +82,9 @@ CC_LOWER_OPT = -O2
6 CC_NO_OPT =
7
8 ifeq ($(PRODUCT), java)
9- _OPT = $(CC_HIGHER_OPT)
10+ _OPT = $(OE_CFLAGS)
11 else
12- _OPT = $(CC_LOWER_OPT)
13+ _OPT = $(OE_CFLAGS)
14 CPPFLAGS_DBG += -DLOGGING
15 endif
16
17@@ -94,7 +94,7 @@ endif
18 # as the default.
19 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
20 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
21-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
22+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
23 CFLAGS_REQUIRED_hppa +=
24 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
25 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
26@@ -221,7 +221,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
27 #
28 # -L paths for finding and -ljava
29 #
30-LDFLAGS_OPT = -Xlinker -O1
31+LDFLAGS_OPT = $(OE_LDFLAGS)
32 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
33 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
34
35diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
36index 4ba1f0e..48cfb02 100644
37--- openjdk/hotspot/make/linux/makefiles/buildtree.make
38+++ openjdk/hotspot/make/linux/makefiles/buildtree.make
39@@ -380,7 +380,7 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
40 echo "rm -f Queens.class"; \
41 echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
42 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
43- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
44+ echo 'echo Silently skipping the execution of the gamma program'; \
45 ) > $@
46 $(QUIETLY) chmod +x $@
47
48diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
49index 11de79a..c5751b2 100644
50--- openjdk/hotspot/make/linux/makefiles/gcc.make
51+++ openjdk/hotspot/make/linux/makefiles/gcc.make
52@@ -140,7 +140,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
53 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
54
55 # The flags to use for an Optimized g++ build
56-OPT_CFLAGS += -O3
57+OPT_CFLAGS += $(OE_CFLAGS)
58
59 # Hotspot uses very unstrict aliasing turn this optimization off
60 OPT_CFLAGS += -fno-strict-aliasing
61@@ -184,7 +184,7 @@ LFLAGS += -Wl,-relax
62 endif
63
64 # Enable linker optimization
65-LFLAGS += -Xlinker -O1
66+LFLAGS += $(OE_LDFLAGS)
67
68 # If this is a --hash-style=gnu system, use --hash-style=both
69 # The gnu .hash section won't work on some Linux systems like SuSE 10.
70diff --git openjdk/hotspot/make/linux/makefiles/gcc.make.orig openjdk/hotspot/make/linux/makefiles/gcc.make.orig
71index 3d6a6b7..11de79a 100644
72--- openjdk/hotspot/make/linux/makefiles/gcc.make.orig
73+++ openjdk/hotspot/make/linux/makefiles/gcc.make.orig
74@@ -204,7 +204,7 @@ SONAMEFLAG = -Xlinker -soname=SONAME
75 SHARED_FLAG = -shared
76
77 # Keep symbols even they are not used
78-AOUT_FLAGS += -export-dynamic
79+AOUT_FLAGS += -Xlinker -export-dynamic
80
81 #------------------------------------------------------------------------
82 # Debug flags
83diff --git openjdk/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
84index 18f65d9..f12a798 100644
85--- openjdk/hotspot/make/linux/makefiles/jsig.make
86+++ openjdk/hotspot/make/linux/makefiles/jsig.make
87@@ -42,7 +42,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
88 # cause problems with interposing. See CR: 6466665
89 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
90
91-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
92+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(OE_LDFLAGS)
93
94 # DEBUG_BINARIES overrides everything, use full -g debug information
95 ifeq ($(DEBUG_BINARIES), true)
96diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make
97index c5cf503..ae7af2e 100644
98--- openjdk/hotspot/make/linux/makefiles/launcher.make
99+++ openjdk/hotspot/make/linux/makefiles/launcher.make
100@@ -50,7 +50,7 @@ ifeq ($(LINK_INTO),AOUT)
101 LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
102 else
103 LAUNCHER.o = launcher.o
104- LFLAGS_LAUNCHER += -L `pwd`
105+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS)
106 LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
107 ifeq ($(SHARK_BUILD), true)
108 LFLAGS_LAUNCHER += $(LLVM_LDFLAGS)
109diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
110index cd8d9ef..b00ce46 100644
111--- openjdk/hotspot/make/linux/makefiles/vm.make
112+++ openjdk/hotspot/make/linux/makefiles/vm.make
113@@ -242,6 +242,7 @@ ifeq ($(SHARK_BUILD), true)
114 LIBS_VM += $(LLVM_LIBS)
115 endif
116
117+LFLAGS_VM += $(OE_LDFLAGS)
118 LINK_VM = $(LINK_LIB.c)
119
120 # rule for building precompiled header
121diff --git openjdk/hotspot/make/linux/makefiles/vm.make.orig openjdk/hotspot/make/linux/makefiles/vm.make.orig
122index fa4116a..cd8d9ef 100644
123--- openjdk/hotspot/make/linux/makefiles/vm.make.orig
124+++ openjdk/hotspot/make/linux/makefiles/vm.make.orig
125@@ -143,13 +143,15 @@ COMPILER2_PATHS := $(GAMMADIR)/src/share/vm/opto
126 COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt
127 COMPILER2_PATHS += $(GENERATED)/adfiles
128
129+SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
130+
131 # Include dirs per type.
132 Src_Dirs/CORE := $(CORE_PATHS)
133 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
134 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
135 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
136 Src_Dirs/ZERO := $(CORE_PATHS)
137-Src_Dirs/SHARK := $(CORE_PATHS)
138+Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
139 Src_Dirs := $(Src_Dirs/$(TYPE))
140
141 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
142diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
143index 4e31797..03a84dd 100644
144--- openjdk/jdk/make/common/Defs-linux.gmk
145+++ openjdk/jdk/make/common/Defs-linux.gmk
146@@ -89,9 +89,9 @@ HPIS = native
147
148 ifndef OPTIMIZATION_LEVEL
149 ifeq ($(PRODUCT), java)
150- OPTIMIZATION_LEVEL = HIGHER
151+ OPTIMIZATION_LEVEL = $(OE_CFLAGS)
152 else
153- OPTIMIZATION_LEVEL = LOWER
154+ OPTIMIZATION_LEVEL = $(OE_CFLAGS)
155 endif
156 endif
157
158@@ -108,7 +108,7 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
159 # as the default.
160 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
161 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
162-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
163+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
164 CFLAGS_REQUIRED_hppa +=
165 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
166 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
167@@ -249,7 +249,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
168 #
169 # -L paths for finding and -ljava
170 #
171-LDFLAGS_OPT = -Xlinker -O1
172+LDFLAGS_OPT = $(OE_LDFLAGS)
173 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
174 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
175
176diff --git openjdk/jdk/make/common/Defs-linux.gmk.orig openjdk/jdk/make/common/Defs-linux.gmk.orig
177index cbbf647..4e31797 100644
178--- openjdk/jdk/make/common/Defs-linux.gmk.orig
179+++ openjdk/jdk/make/common/Defs-linux.gmk.orig
180@@ -86,18 +86,22 @@ HPIS = native
181 #
182 # Default optimization
183 #
184-CC_HIGHEST_OPT = -O3
185-CC_HIGHER_OPT = -O3
186-CC_LOWER_OPT = -O2
187-CC_NO_OPT =
188
189-ifeq ($(PRODUCT), java)
190- _OPT = $(CC_HIGHER_OPT)
191-else
192- _OPT = $(CC_LOWER_OPT)
193- CPPFLAGS_DBG += -DLOGGING
194+ifndef OPTIMIZATION_LEVEL
195+ ifeq ($(PRODUCT), java)
196+ OPTIMIZATION_LEVEL = HIGHER
197+ else
198+ OPTIMIZATION_LEVEL = LOWER
199+ endif
200 endif
201
202+CC_OPT/NONE =
203+CC_OPT/LOWER = -O2
204+CC_OPT/HIGHER = -O3
205+CC_OPT/HIGHEST = -O3
206+
207+CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
208+
209 # For all platforms, do not omit the frame pointer register usage.
210 # We need this frame pointer to make it easy to walk the stacks.
211 # This should be the default on X86, but ia64 and amd64 may not have this
212@@ -131,17 +135,13 @@ else
213 LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
214 endif
215
216-# Add in platform specific optimizations for all opt levels
217-CC_HIGHEST_OPT += $(_OPT_$(ARCH))
218-CC_HIGHER_OPT += $(_OPT_$(ARCH))
219-CC_LOWER_OPT += $(_OPT_$(ARCH))
220-
221-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
222-ifdef NO_OPTIMIZATIONS
223- CC_HIGHEST_OPT = $(CC_NO_OPT)
224- CC_HIGHER_OPT = $(CC_NO_OPT)
225- CC_LOWER_OPT = $(CC_NO_OPT)
226+# If this is a --hash-style=gnu system, use --hash-style=both
227+# The gnu .hash section won't work on some Linux systems like SuSE 10.
228+_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu')
229+ifneq ($(_HAS_HASH_STYLE_GNU),)
230+ LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
231 endif
232+LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE)
233
234 #
235 # Selection of warning messages
236@@ -188,19 +188,19 @@ ifeq ($(DEBUG_BINARIES), true)
237 CFLAGS_REQUIRED += $(DEBUG_FLAG)
238 endif
239
240-CFLAGS_OPT = $(POPT)
241+CFLAGS_OPT = $(CC_OPT)
242 CFLAGS_DBG = $(DEBUG_FLAG)
243 CFLAGS_COMMON += $(CFLAGS_REQUIRED)
244
245 CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
246-CXXFLAGS_OPT = $(POPT)
247+CXXFLAGS_OPT = $(CC_OPT)
248 CXXFLAGS_DBG = $(DEBUG_FLAG)
249 CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
250
251 # FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
252 ifeq ($(FASTDEBUG), true)
253- CFLAGS_DBG += $(CC_LOWER_OPT)
254- CXXFLAGS_DBG += $(CC_LOWER_OPT)
255+ CFLAGS_DBG += $(CC_OPT/LOWER)
256+ CXXFLAGS_DBG += $(CC_OPT/LOWER)
257 endif
258
259 CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
260@@ -221,6 +221,9 @@ endif
261
262 CPPFLAGS_OPT =
263 CPPFLAGS_DBG = -DDEBUG
264+ifneq ($(PRODUCT), java)
265+ CPPFLAGS_DBG += -DLOGGING
266+endif
267
268 ifdef LIBRARY
269 # Libraries need to locate other libraries at runtime, and you can tell
270@@ -255,9 +258,8 @@ LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
271 # statically link libgcc but will print a warning with the flag. We don't
272 # want the warning, so check gcc version first.
273 #
274-CC_VER_MAJOR := $(shell $(CC) -dumpversion | $(SED) 's/egcs-//' | $(CUT) -d'.' -f1)
275-ifeq ("$(CC_VER_MAJOR)", "3")
276-OTHER_LDFLAGS += -static-libgcc
277+ifeq ($(CC_MAJORVER),3)
278+ OTHER_LDFLAGS += -static-libgcc
279 endif
280
281 # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
282diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
283index e462fba..76b56be 100644
284--- openjdk/jdk/make/sun/awt/Makefile
285+++ openjdk/jdk/make/sun/awt/Makefile
286@@ -511,10 +511,10 @@ ifneq ($(PLATFORM), windows)
287 #
288
289 ifeq ($(PLATFORM), linux)
290-CPPFLAGS += -I$(MOTIF_DIR)/include \
291- -I$(OPENWIN_HOME)/include \
292- -I$(OPENWIN_HOME)/include/X11/extensions \
293- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
294+#CPPFLAGS += -I$(MOTIF_DIR)/include \
295+# -I$(OPENWIN_HOME)/include \
296+# -I$(OPENWIN_HOME)/include/X11/extensions \
297+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
298 endif
299 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
300 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
301@@ -538,7 +538,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
302 $(EVENT_MODEL)
303
304 ifeq ($(PLATFORM), linux)
305-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
306+#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
307 endif
308
309 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
310diff --git openjdk/jdk/make/sun/awt/Makefile.orig openjdk/jdk/make/sun/awt/Makefile.orig
311index 61f36cd..e462fba 100644
312--- openjdk/jdk/make/sun/awt/Makefile.orig
313+++ openjdk/jdk/make/sun/awt/Makefile.orig
314@@ -28,17 +28,13 @@ PACKAGE = sun.awt
315 LIBRARY = awt
316 PRODUCT = sun
317
318-#
319 # Tell Defs.gmk that VIS is needed
320-#
321 VIS_NEEDED=true
322
323-include $(BUILDDIR)/common/Defs.gmk
324-
325-#
326 # Use highest optimization level
327-#
328-_OPT = $(CC_HIGHEST_OPT)
329+OPTMIZATION_LEVEL = HIGHEST
330+
331+include $(BUILDDIR)/common/Defs.gmk
332
333 OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES
334
335@@ -388,6 +384,10 @@ _FONTCONFIGS = \
336 fontconfig.SuSE.properties \
337 fontconfig.Ubuntu.properties \
338 fontconfig.Fedora.properties \
339+ fontconfig.Fedora.9.properties \
340+ fontconfig.Fedora.10.properties \
341+ fontconfig.Fedora.11.properties \
342+ fontconfig.Fedora.12.properties \
343 fontconfig.RedHat.6.properties \
344 fontconfig.Gentoo.properties
345 else
346diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
347index 44de692..9ce661c 100644
348--- openjdk/jdk/make/sun/awt/mawt.gmk
349+++ openjdk/jdk/make/sun/awt/mawt.gmk
350@@ -196,8 +196,8 @@ endif
351 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
352
353 ifndef HEADLESS
354-CPPFLAGS += -I$(OPENWIN_HOME)/include
355-LDFLAGS += -L$(OPENWIN_LIB)
356+#CPPFLAGS += -I$(OPENWIN_HOME)/include
357+#LDFLAGS += -L$(OPENWIN_LIB)
358
359 endif # !HEADLESS
360
361@@ -225,8 +225,8 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
362
363 ifeq ($(PLATFORM), linux)
364 # Checking for the X11/extensions headers at the additional location
365- CPPFLAGS += -I/X11R6/include/X11/extensions \
366- -I/usr/include/X11/extensions
367+# CPPFLAGS += -I/X11R6/include/X11/extensions \
368+# -I/usr/include/X11/extensions
369 endif
370
371 ifeq ($(PLATFORM), solaris)
372diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
373index 4b4c782..440699b 100644
374--- openjdk/jdk/make/sun/xawt/Makefile
375+++ openjdk/jdk/make/sun/xawt/Makefile
376@@ -129,11 +129,12 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \
377 -I$(PLATFORM_SRC)/native/sun/awt
378
379 ifeq ($(PLATFORM), linux)
380+# Very unsuitable for cross-compilation.
381 # Allows for builds on Debian GNU Linux, X11 is in a different place
382- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
383- -I/usr/include/X11/extensions \
384- -I$(MOTIF_DIR)/include \
385- -I$(OPENWIN_HOME)/include
386+# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
387+# -I/usr/include/X11/extensions \
388+# -I$(MOTIF_DIR)/include \
389+# -I$(OPENWIN_HOME)/include
390 endif
391
392 ifeq ($(PLATFORM), solaris)
393@@ -250,7 +251,7 @@ $(SIZES): $(SIZERS)
394 $(CHMOD) +w $@;\
395 else \
396 $(ECHO) GENERATING $@; \
397- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
398+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
399 fi
400 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
401 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
402diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
403index 6693e2a..494a646 100644
404--- openjdk/jdk/make/sun/splashscreen/Makefile
405+++ openjdk/jdk/make/sun/splashscreen/Makefile
406@@ -63,8 +63,8 @@ CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE
407
408 ifneq ($(PLATFORM), windows)
409 CFLAGS += -DWITH_X11
410- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
411- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
412+ #CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
413+ OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread
414 else # PLATFORM
415 CFLAGS += -DWITH_WIN32
416 OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
417diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
418index 440699b..1fa311d 100644
419--- openjdk/jdk/make/sun/xawt/Makefile
420+++ openjdk/jdk/make/sun/xawt/Makefile
421@@ -46,7 +46,7 @@ include FILES_export_unix.gmk
422 AUTO_FILES_JAVA_DIRS = sun/awt/X11
423 AUTO_JAVA_PRUNE = WrapperGenerator.java
424
425-LDFLAGS += -L$(OPENWIN_LIB)
426+#LDFLAGS += -L$(OPENWIN_LIB)
427
428 # For Xrender extension.
429 ifeq ($(PLATFORM), solaris)
430diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher
431index f59a9d6..6edc880 100644
432--- openjdk/jdk/make/launchers/Makefile.launcher
433+++ openjdk/jdk/make/launchers/Makefile.launcher
434@@ -152,7 +152,7 @@ endif
435 ifeq ($(GUI_TOOL),true)
436 ifneq ($(PLATFORM), windows)
437 # Anything with a GUI needs X11 to be linked in.
438- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
439+ OTHER_LDLIBS += -lX11
440 endif
441 endif
442
443diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
444index 2021434..9035da7 100644
445--- openjdk/jdk/make/sun/jawt/Makefile
446+++ openjdk/jdk/make/sun/jawt/Makefile
447@@ -98,8 +98,7 @@ else # PLATFORM
448 #
449 # Other extra flags needed for compiling.
450 #
451-CPPFLAGS += -I$(OPENWIN_HOME)/include \
452- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
453+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
454 -I$(SHARE_SRC)/native/$(PKGDIR)/image \
455 -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
456 -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
457diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
458index 1fa311d..f3d06ad 100644
459--- openjdk/jdk/make/sun/xawt/Makefile
460+++ openjdk/jdk/make/sun/xawt/Makefile
461@@ -232,7 +232,7 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
462
463 $(SIZERS): $(SIZERS_C)
464 $(prep-target)
465- $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
466+ $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -fuse-ld=bfd -o $@ $(SIZER)$(suffix $@).c
467
468 $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
469 $(prep-target)
diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch
deleted file mode 100644
index 0d3ce04..0000000
--- a/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
2index 55c0e88..220aa5c 100644
3--- openjdk/jdk/make/common/shared/Sanity.gmk
4+++ openjdk/jdk/make/common/shared/Sanity.gmk
5@@ -102,11 +102,6 @@ ifeq ($(PLATFORM), linux)
6 if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \
7 $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \
8 fi)
9- ALSA_INCLUDE=/usr/include/alsa/version.h
10- ALSA_LIBRARY=/usr/lib/libasound.so
11- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
12- $(SED) -e 's@.*\"\(.*\)\".*@\1@' )
13- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
14 endif
15
16 ifeq ($(PLATFORM), windows)
17@@ -210,7 +210,6 @@ endif
18 sane-compiler \
19 sane-link \
20 sane-cacerts \
21- sane-alsa-headers \
22 sane-ant_version \
23 sane-zip_version \
24 sane-unzip_version \
25@@ -1351,9 +1346,6 @@ endif
26 # need /usr/include/alsa/version.h and /usr/lib/libasound.so
27 ######################################################
28
29-ifdef REQUIRED_ALSA_VERSION
30- ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION))
31-endif
32 sane-alsa-headers:
33 ifdef REQUIRED_ALSA_VERSION
34 @if [ "$(ALSA_CHECK)" != "missing" ] ; then \
diff --git a/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch
deleted file mode 100644
index 93ca65d..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch
+++ /dev/null
@@ -1,119 +0,0 @@
1Index: icedtea6-1.13.3/Makefile.am
2===================================================================
3--- icedtea6-1.13.3.orig/Makefile.am 2014-06-09 21:46:36.640603938 +0200
4+++ icedtea6-1.13.3/Makefile.am 2014-06-09 21:51:34.228435112 +0200
5@@ -795,6 +795,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@@ -2025,9 +2030,7 @@
18 rm -f stamps/pax-mark-vm-debug.stamp
19
20 stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm.stamp
21- if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
22- $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
23- fi
24+ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
25 mkdir -p stamps
26 touch $@
27
28@@ -2035,9 +2038,7 @@
29 rm -f stamps/check-crypto.stamp
30
31 stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-debug.stamp
32- if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
33- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
34- fi
35+ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
36 mkdir -p stamps
37 touch $@
38
39@@ -2219,9 +2220,7 @@
40 rm -f stamps/pax-mark-vm-ecj.stamp
41
42 stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-ecj.stamp
43- if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
44- $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
45- fi
46+ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
47 mkdir -p stamps
48 touch $@
49
50@@ -2379,10 +2378,14 @@
51 if BUILD_JAMVM
52 cd jamvm/jamvm && \
53 LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
54- ./autogen.sh --with-java-runtime-library=openjdk6 \
55- --prefix=$(abs_top_builddir)/jamvm/install ; \
56- $(MAKE) ; \
57- $(MAKE) install
58+ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk6 \
59+ --prefix=$(abs_top_builddir)/jamvm/install \
60+ --host=$(host_alias) \
61+ --build=$(build_alias) \
62+ --target=$(target_alias) \
63+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \
64+ $(ARCH_PREFIX) $(MAKE) ; \
65+ $(ARCH_PREFIX) $(MAKE) install
66 mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
67 cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
68 ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
69@@ -2446,6 +2449,7 @@
70 --host=$(host_alias) \
71 --build=$(build_alias) \
72 --target=$(target_alias) \
73+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \
74 --prefix=$(abs_top_builddir)/cacao/install \
75 --with-java-runtime-library=openjdk \
76 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
77@@ -2514,7 +2518,7 @@
78 # configure script arguments, quoted in single quotes
79 CONFIGURE_ARGS = @CONFIGURE_ARGS@
80 ADD_ZERO_CONFIGURE_ARGS = \
81- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
82+ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
83 --enable-zero
84 if ADD_SHARK_BUILD
85 ADD_ZERO_CONFIGURE_ARGS += \
86Index: icedtea6-1.13.3/javac.in
87===================================================================
88--- icedtea6-1.13.3.orig/javac.in 2014-06-09 21:46:36.640603938 +0200
89+++ icedtea6-1.13.3/javac.in 2014-06-09 21:46:36.636603946 +0200
90@@ -40,7 +40,7 @@
91 {
92 my @new_args = @{$_[0]};
93
94- for my $opt (NO_DUP_ARGS)
95+ for my $opt (NO_DUP_ARGS)
96 {
97 my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
98 if (@indices > 1) {
99@@ -49,7 +49,7 @@
100 }
101 }
102
103- for my $opt (STRIP_ARGS)
104+ for my $opt (STRIP_ARGS)
105 {
106 my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
107 splice @new_args, $_, 1 for @indices;
108@@ -91,7 +91,10 @@
109 my @CLASSPATH = ('@ECJ_JAR@');
110 push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
111 $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
112- exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
113+
114+ # Compiling hotspot-tools consumes tons of memory and exceeds any default
115+ # limits for jamvm and cacao.
116+ exec '@JAVA@', '-Xmx1024m', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
117 }
118 else
119 {
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch
deleted file mode 100644
index 067b356..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch
+++ /dev/null
@@ -1,280 +0,0 @@
1diff --git openjdk/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
2index f308203..5ba15dc 100644
3--- openjdk/corba/make/common/Defs-linux.gmk
4+++ openjdk/corba/make/common/Defs-linux.gmk
5@@ -82,9 +82,9 @@ CC_LOWER_OPT = -O2
6 CC_NO_OPT =
7
8 ifeq ($(PRODUCT), java)
9- _OPT = $(CC_HIGHER_OPT)
10+ _OPT = $(OE_CFLAGS)
11 else
12- _OPT = $(CC_LOWER_OPT)
13+ _OPT = $(OE_CFLAGS)
14 CPPFLAGS_DBG += -DLOGGING
15 endif
16
17@@ -94,7 +94,7 @@ endif
18 # as the default.
19 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
20 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
21-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
22+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
23 CFLAGS_REQUIRED_hppa +=
24 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
25 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
26@@ -221,7 +221,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
27 #
28 # -L paths for finding and -ljava
29 #
30-LDFLAGS_OPT = -Xlinker -O1
31+LDFLAGS_OPT = $(OE_LDFLAGS)
32 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
33 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
34
35diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
36index 11de79a..c5751b2 100644
37--- openjdk/hotspot/make/linux/makefiles/gcc.make
38+++ openjdk/hotspot/make/linux/makefiles/gcc.make
39@@ -140,7 +140,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
40 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
41
42 # The flags to use for an Optimized g++ build
43-OPT_CFLAGS += -O3
44+OPT_CFLAGS += $(OE_CFLAGS)
45
46 # Hotspot uses very unstrict aliasing turn this optimization off
47 OPT_CFLAGS += -fno-strict-aliasing
48@@ -184,7 +184,7 @@ LFLAGS += -Wl,-relax
49 endif
50
51 # Enable linker optimization
52-LFLAGS += -Xlinker -O1
53+LFLAGS += $(OE_LDFLAGS)
54
55 # If this is a --hash-style=gnu system, use --hash-style=both
56 # The gnu .hash section won't work on some Linux systems like SuSE 10.
57diff --git openjdk/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
58index 18f65d9..f12a798 100644
59--- openjdk/hotspot/make/linux/makefiles/jsig.make
60+++ openjdk/hotspot/make/linux/makefiles/jsig.make
61@@ -42,7 +42,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
62 # cause problems with interposing. See CR: 6466665
63 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
64
65-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
66+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(OE_LDFLAGS)
67
68 # DEBUG_BINARIES overrides everything, use full -g debug information
69 ifeq ($(DEBUG_BINARIES), true)
70diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make
71index c5cf503..ae7af2e 100644
72--- openjdk/hotspot/make/linux/makefiles/launcher.make
73+++ openjdk/hotspot/make/linux/makefiles/launcher.make
74@@ -50,7 +50,7 @@ ifeq ($(LINK_INTO),AOUT)
75 LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
76 else
77 LAUNCHER.o = launcher.o
78- LFLAGS_LAUNCHER += -L `pwd`
79+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS)
80 LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
81 ifeq ($(SHARK_BUILD), true)
82 LFLAGS_LAUNCHER += $(LLVM_LDFLAGS)
83diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
84index 4e31797..03a84dd 100644
85--- openjdk/jdk/make/common/Defs-linux.gmk
86+++ openjdk/jdk/make/common/Defs-linux.gmk
87@@ -89,9 +89,9 @@ HPIS = native
88
89 ifndef OPTIMIZATION_LEVEL
90 ifeq ($(PRODUCT), java)
91- OPTIMIZATION_LEVEL = HIGHER
92+ OPTIMIZATION_LEVEL = $(OE_CFLAGS)
93 else
94- OPTIMIZATION_LEVEL = LOWER
95+ OPTIMIZATION_LEVEL = $(OE_CFLAGS)
96 endif
97 endif
98
99@@ -108,7 +108,7 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
100 # as the default.
101 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
102 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
103-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
104+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
105 CFLAGS_REQUIRED_hppa +=
106 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
107 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
108@@ -249,7 +249,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
109 #
110 # -L paths for finding and -ljava
111 #
112-LDFLAGS_OPT = -Xlinker -O1
113+LDFLAGS_OPT = $(OE_LDFLAGS)
114 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
115 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
116
117diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
118index e462fba..76b56be 100644
119--- openjdk/jdk/make/sun/awt/Makefile
120+++ openjdk/jdk/make/sun/awt/Makefile
121@@ -511,10 +511,10 @@ ifneq ($(PLATFORM), windows)
122 #
123
124 ifeq ($(PLATFORM), linux)
125-CPPFLAGS += -I$(MOTIF_DIR)/include \
126- -I$(OPENWIN_HOME)/include \
127- -I$(OPENWIN_HOME)/include/X11/extensions \
128- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
129+#CPPFLAGS += -I$(MOTIF_DIR)/include \
130+# -I$(OPENWIN_HOME)/include \
131+# -I$(OPENWIN_HOME)/include/X11/extensions \
132+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
133 endif
134 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
135 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
136@@ -538,7 +538,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
137 $(EVENT_MODEL)
138
139 ifeq ($(PLATFORM), linux)
140-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
141+#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
142 endif
143
144 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
145diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
146index 44de692..9ce661c 100644
147--- openjdk/jdk/make/sun/awt/mawt.gmk
148+++ openjdk/jdk/make/sun/awt/mawt.gmk
149@@ -196,8 +196,8 @@ endif
150 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
151
152 ifndef HEADLESS
153-CPPFLAGS += -I$(OPENWIN_HOME)/include
154-LDFLAGS += -L$(OPENWIN_LIB)
155+#CPPFLAGS += -I$(OPENWIN_HOME)/include
156+#LDFLAGS += -L$(OPENWIN_LIB)
157
158 endif # !HEADLESS
159
160@@ -225,8 +225,8 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
161
162 ifeq ($(PLATFORM), linux)
163 # Checking for the X11/extensions headers at the additional location
164- CPPFLAGS += -I/X11R6/include/X11/extensions \
165- -I/usr/include/X11/extensions
166+# CPPFLAGS += -I/X11R6/include/X11/extensions \
167+# -I/usr/include/X11/extensions
168 endif
169
170 ifeq ($(PLATFORM), solaris)
171diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
172index 4b4c782..440699b 100644
173--- openjdk/jdk/make/sun/xawt/Makefile
174+++ openjdk/jdk/make/sun/xawt/Makefile
175@@ -129,11 +129,12 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \
176 -I$(PLATFORM_SRC)/native/sun/awt
177
178 ifeq ($(PLATFORM), linux)
179+# Very unsuitable for cross-compilation.
180 # Allows for builds on Debian GNU Linux, X11 is in a different place
181- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
182- -I/usr/include/X11/extensions \
183- -I$(MOTIF_DIR)/include \
184- -I$(OPENWIN_HOME)/include
185+# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
186+# -I/usr/include/X11/extensions \
187+# -I$(MOTIF_DIR)/include \
188+# -I$(OPENWIN_HOME)/include
189 endif
190
191 ifeq ($(PLATFORM), solaris)
192@@ -250,7 +251,7 @@ $(SIZES): $(SIZERS)
193 $(CHMOD) +w $@;\
194 else \
195 $(ECHO) GENERATING $@; \
196- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
197+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
198 fi
199 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
200 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
201diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
202index 440699b..1fa311d 100644
203--- openjdk/jdk/make/sun/xawt/Makefile
204+++ openjdk/jdk/make/sun/xawt/Makefile
205@@ -46,7 +46,7 @@ include FILES_export_unix.gmk
206 AUTO_FILES_JAVA_DIRS = sun/awt/X11
207 AUTO_JAVA_PRUNE = WrapperGenerator.java
208
209-LDFLAGS += -L$(OPENWIN_LIB)
210+#LDFLAGS += -L$(OPENWIN_LIB)
211
212 # For Xrender extension.
213 ifeq ($(PLATFORM), solaris)
214diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher
215index f59a9d6..6edc880 100644
216--- openjdk/jdk/make/launchers/Makefile.launcher
217+++ openjdk/jdk/make/launchers/Makefile.launcher
218@@ -152,7 +152,7 @@ endif
219 ifeq ($(GUI_TOOL),true)
220 ifneq ($(PLATFORM), windows)
221 # Anything with a GUI needs X11 to be linked in.
222- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
223+ OTHER_LDLIBS += -lX11
224 endif
225 endif
226
227diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile
228index 2021434..9035da7 100644
229--- openjdk/jdk/make/sun/jawt/Makefile
230+++ openjdk/jdk/make/sun/jawt/Makefile
231@@ -98,8 +98,7 @@ else # PLATFORM
232 #
233 # Other extra flags needed for compiling.
234 #
235-CPPFLAGS += -I$(OPENWIN_HOME)/include \
236- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
237+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
238 -I$(SHARE_SRC)/native/$(PKGDIR)/image \
239 -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
240 -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
241diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
242index 1fa311d..f3d06ad 100644
243--- openjdk/jdk/make/sun/xawt/Makefile
244+++ openjdk/jdk/make/sun/xawt/Makefile
245@@ -232,7 +232,7 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
246
247 $(SIZERS): $(SIZERS_C)
248 $(prep-target)
249- $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
250+ $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -fuse-ld=bfd -o $@ $(SIZER)$(suffix $@).c
251
252 $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
253 $(prep-target)
254diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
255index 7271a9e..e441970 100644
256--- openjdk/hotspot/make/linux/makefiles/vm.make
257+++ openjdk/hotspot/make/linux/makefiles/vm.make
258@@ -290,6 +290,7 @@ ifeq ($(SHARK_BUILD), true)
259 LIBS_VM += $(LLVM_LIBS)
260 endif
261
262+LFLAGS_VM += $(OE_LDFLAGS)
263 LINK_VM = $(LINK_LIB.CC)
264
265 # rule for building precompiled header
266diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
267index d8d89aa..539854a 100644
268--- openjdk/jdk/make/sun/splashscreen/Makefile
269+++ openjdk/jdk/make/sun/splashscreen/Makefile
270@@ -66,8 +66,8 @@ endif
271
272 ifneq ($(PLATFORM), windows)
273 CFLAGS += -DWITH_X11
274- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
275- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
276+ #CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
277+ OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpthread
278 else # PLATFORM
279 CFLAGS += -DWITH_WIN32
280 OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch
deleted file mode 100644
index 917a5b8..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
2index 88875b2..2ab8aaf 100644
3--- openjdk/jdk/make/common/shared/Sanity.gmk
4+++ openjdk/jdk/make/common/shared/Sanity.gmk
5@@ -31,6 +31,7 @@
6 # Shared sanity rules for the JDK builds.
7 #
8
9+
10 .SUFFIXES: .hdiffs
11
12 # All files created during sanity checking
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch
deleted file mode 100644
index 3d7c619..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff --git openjdk/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
2index b40c081..2dfbfc8 100644
3--- openjdk/hotspot/make/linux/makefiles/rules.make
4+++ openjdk/hotspot/make/linux/makefiles/rules.make
5@@ -36,6 +36,7 @@ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
6 # variables: $(CFLAGS), $(CXXFLAGS) and $(CPPFLAGS).
7 CC_COMPILE = $(CC) $(CXXFLAGS)
8 CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS)
9+CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS)
10
11 AS.S = $(AS) $(ASFLAGS)
12
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch
deleted file mode 100644
index 55f1f9c..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile
2index eaf8a6e..4938613 100644
3--- openjdk/jdk/make/com/sun/jmx/Makefile
4+++ openjdk/jdk/make/com/sun/jmx/Makefile
5@@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/
6 # when available, we need to run with latest rmic version available. rmic
7 # launch tool not built at this stage but we can invoke via rmi class.
8
9-RMIC_JAVA = $(OUTPUTDIR)/bin/java
10+RMIC_JAVA = $(BOOTDIR)/bin/java
11 # need to treat 64bit solaris differently
12 ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
13 RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch
deleted file mode 100644
index 6dd36af..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001
2From: Alex Gonzalez <alex.gonzalez@digi.com>
3Date: Wed, 31 Dec 2014 16:07:32 +0100
4Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration
5 date
6
7Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
8---
9 .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 ---
10 1 file changed, 3 deletions(-)
11
12diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
13index bf335fa22c1d..0e421360fef9 100644
14--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
15+++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
16@@ -281,9 +281,6 @@ public class GenerateCurrencyData {
17 checkCurrencyCode(newCurrency);
18 String timeString = currencyInfo.substring(4, length - 4);
19 long time = format.parse(timeString).getTime();
20- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
21- throw new RuntimeException("time is more than 10 years from present: " + time);
22- }
23 specialCaseCutOverTimes[specialCaseCount] = time;
24 specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
25 specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency);
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch
deleted file mode 100644
index cab80ac..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
2index 8986146..846bd6b 100644
3--- openjdk/hotspot/make/linux/makefiles/gcc.make
4+++ openjdk/hotspot/make/linux/makefiles/gcc.make
5@@ -132,11 +132,6 @@ else
6 CFLAGS += -pipe
7 endif
8
9-# Compiler warnings are treated as errors
10-ifneq ($(COMPILER_WARNINGS_FATAL),false)
11-WARNINGS_ARE_ERRORS = -Werror
12-endif
13-
14 # Except for a few acceptable ones
15 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
16 # conversions which might affect the values. To avoid that, we need to turn
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
deleted file mode 100644
index f14deaf..0000000
--- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
2index c2a1484..f460d85 100644
3--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
4+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
5@@ -32,13 +32,20 @@ Obj_Files += cppInterpreter_arm.o
6 Obj_Files += thumb2.o
7
8 CFLAGS += -DHOTSPOT_ASM
9+CCFLAGS += -DHOTSPOT_ASM
10+
11+ifeq ($(CROSS_COMPILATION), true)
12+ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD)
13+else
14+ C_COMPILE_FOR_MKBC = $(C_COMPILE)
15+endif
16
17 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
18 thumb2.o: offsets_arm.s
19
20 offsets_arm.s: mkoffsets
21 @echo Generating assembler offsets
22- ./mkoffsets > $@
23+ $(QEMU) ./mkoffsets > $@
24
25 bytecodes_arm.s: bytecodes_arm.def mkbc
26 @echo Generating ARM assembler bytecode sequences
27@@ -46,12 +53,12 @@ bytecodes_arm.s: bytecodes_arm.def mkbc
28
29 mkbc: $(GAMMADIR)/tools/mkbc.c
30 @echo Compiling mkbc tool
31- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
32+ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE)
33
34 mkoffsets: asm_helper.cpp
35 @echo Compiling offset generator
36 $(QUIETLY) $(REMOVE_TARGET)
37- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
38+ $(CC_COMPILE) $(CFLAGS) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
39
40 endif
41
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
deleted file mode 100644
index cf192d0..0000000
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ /dev/null
@@ -1,396 +0,0 @@
1require openjdk-common.inc
2
3ICEDTEA = "icedtea6-${ICEDTEA_VERSION}"
4
5INC_PR = "r22"
6
7SRC_URI = "\
8 ${ICEDTEA_URI} \
9 ${OPENJDK_URI} \
10 ${JAXWS_URI} \
11 ${JAF_URI} \
12 ${JAXP_URI} \
13 ${CACAO_URI} \
14 ${JAMVM_URI} \
15 ${OEPATCHES} \
16 ${ICEDTEAPATCHES} \
17 file://jvm.cfg \
18 "
19
20JDKPN = "openjdk-6"
21JDK_DIR = "java-6-openjdk"
22
23PN = "${JDKPN}-jre"
24PROVIDES += "${JDKPN} ${PACKAGES}"
25
26DEPENDS = "giflib libpng jpeg cups \
27 rhino \
28 freetype libxinerama libxt libxrender libxtst libxi \
29 alsa-lib libffi \
30 ant-native \
31 fastjar-native \
32 icedtea6-native \
33 zip-native \
34 "
35
36# No package should directly depend on this (it should require
37# java2-runtime instead).
38PRIVATE_LIBS = "\
39 lib.so libunpack.so libverify.so libjava.so libzip.so libnpt.so \
40 libjava_crw_demo.so libhprof.so libjavanet.so libnio.so \
41 libmanagement.so libinstrument.so libjsound.so libjsoundalsa.so \
42 libj2pcsc.so libj2pkcs11.so libj2gss.so libmlib_image.so \
43 libawt.so libsplashscreen.so libfreetype.so.6 libfontmanager.so \
44 libjpeg.so liblcms.so librmi.so libjawt.so libjaas_unix.so \
45 libattach.so libjdwp.so libdt_socket.so libhpi.so libjli.so \
46 libmawt.so libjvm.so \
47 libversionCheck.so libcompiledMethodLoad.so libgctest.so \
48 libheapViewer.so libheapTracker.so libminst.so libmtrace.so \
49 libwaiters.so libhprof.so \
50 "
51
52
53export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
54export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
55export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
56export CACAO_CONFIGURE_ARGS = "\
57 ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']}"
58
59JAVA_HOME[unexport] = "1"
60
61EXTRA_OECONF = "\
62 --disable-docs \
63 --disable-pulse-java \
64 \
65 --with-ecj-jar=${STAGING_DATADIR_JAVA_NATIVE}/ecj-bootstrap.jar \
66 --with-java=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/java \
67 --with-javac=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javac \
68 --with-javah=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javah \
69 --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \
70 --with-rmic=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/rmic \
71 --with-native2ascii=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/native2ascii \
72 --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \
73 --without-ant-home \
74 --with-openjdk-src-dir=${WORKDIR}/openjdk-src-dir \
75 --with-parallel-jobs=${JDK_JOBS} \
76 \
77 --with-pkgversion=${PV} \
78 --with-cc-for-build=${BUILD_CC} \
79 --enable-zero \
80 --with-additional-vms=${WITH_ADDITIONAL_VMS} \
81 --enable-openjdk-cross-compilation \
82 "
83
84
85# OpenJDK supports parallel compilation but uses a plain number for this.
86# In OE we have PARALLEL_MAKE which is the actual option passed to make,
87# e.g. "-j 4".
88def get_jdk_jobs(d):
89 import bb
90
91 pm = bb.data.getVar('PARALLEL_MAKE', d, 1);
92 if not pm:
93 return "1"
94
95 pm = pm.split("j");
96 if (len(pm) == 2):
97 return pm[1]
98
99 # Whatever found in PARALLEL_MAKE was not suitable.
100 return "1"
101
102JDK_JOBS = "${@get_jdk_jobs(d)}"
103
104# Custom preparation of the sources which:
105# - cleans up the sources
106# - copies the patches into the proper directory
107# - prepares the FakeJDK directory structure
108#DISABLED because of incompatibility with oe stable 2009: do_prepareconfigure () {
109do_configure_prepend() {
110 chmod -R ug+w ${WORKDIR}/openjdk-src-dir
111 (cd ${WORKDIR}/openjdk-src-dir && sh ${S}/fsg.sh)
112
113 # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with
114 # ".patch" into the patches directory.
115 find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \;
116 find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \;
117
118 # use now the rt.jar from icedtea6-native
119 mkdir -p ${WORKDIR}/fake-jdk/jre/lib
120 ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar ${WORKDIR}/fake-jdk/jre/lib/rt.jar
121
122 symlinked=false
123 bbnote "Creating symlinks for fake-jdk"
124 mkdir -p ${WORKDIR}/fake-jdk/include
125 for i in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include` ;do
126 bn=`basename $i`
127 echo "Symlinking: $bn"
128 ln -sf $i ${WORKDIR}/fake-jdk/include/$bn;
129 symlinked=true
130 done
131
132 # If the symlinks have not been created the built cannot continue. This
133 # can happen if icedtea6-native is not ready at this point. The recipe
134 # should make sure this is not the case but a little sanity checking
135 # in such a complicated build can't be wrong.
136 if [ x$symlinked = xfalse ]
137 then
138 bberror "Build b0rken! Have not created any symlinks for fake-jdk!"
139 else
140 bbnote "fake-jdk setup appears sane."
141 fi
142}
143
144# Note: The following lines only work for OE.dev branch but cause an exception
145# in oe stable's 2009 bitbake. As such the function is prepended to do_configure instead.
146#addtask prepareconfigure after do_patch before do_configure
147# Makes prepareconfigure depend on icedtea6-native having being staged.
148#do_prepareconfigure[depends] += "icedtea6-native:do_populate_sysroot"
149
150
151do_configure_append() {
152 oe_runmake patch-ecj
153}
154
155# Work around broken variable quoting in oe-stable 2009 and provide the variable
156# via the environment which then overrides the erroneous value that was written
157# into '${ICETDEA}/Makefile'.
158# Icedtea's makefile is not compatible to parallelization so we cannot allow
159# passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are
160# parallelizable and we need ${PARALLEL_MAKE} to derive the proper value.
161# The base for this quirk is that GNU Make only considers the last "-j" option.
162EXTRA_OEMAKE += '-j 1 CC="${CC}" CCC="${CXX}" CPP="${CPP}" CXX="${CXX}" CC_FOR_BUILD="${BUILD_CC}"'
163
164EXTRA_OEMAKE += ' \
165 OE_CFLAGS="${TARGET_CFLAGS}" \
166 OE_CPPFLAGS="${TARGET_CPPFLAGS}" \
167 OE_CXXFLAGS="${TARGET_CXXFLAGS}" \
168 OE_LDFLAGS="${TARGET_LDFLAGS}" \
169 ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \
170 CROSS_COMPILE_ARCH="${JDK_ARCH}" \
171 '
172
173OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,/usr/lib/llvm${WANT_LLVM_RELEASE}"
174
175EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"'
176
177
178# The build of OpenJDK is a 3-part process. For better restartability and overrideability they have been split into
179# three functions.
180# 1. compile Hotspot or Cacao (this one is supposed to be implemented according to wanted VM)
181# 2. compile openjdk-ecj (to have libraries as libjvm.so and libjava.so which are needed later)
182# 3. compile openjdk (the final result)
183
184do_compilestepone() {
185 oe_runmake bootstrap-directory-ecj
186
187 # now we need to override the tools.jar to point to the normal jdk's tools.jar
188 rm bootstrap/ecj/lib/tools.jar
189 ln -s ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/lib/tools.jar bootstrap/ecj/lib/tools.jar
190
191 # First build hotspot to get a libjvm.so (to link corba in the icedtea-ecj build)
192 bbnote "1/3 Building Hotspot"
193 oe_runmake hotspot
194
195 # Remove spurious libarch directory/symlink
196 rm -rf bootstrap/ecj/jre/lib/${JDK_ARCH} || true
197
198 # Provide a symlink to the target arch's libjvm.so (to link against)
199 ln -s `pwd`/${BUILD_DIR_ECJ}/j2sdk-image/jre/lib/${JDK_ARCH} bootstrap/jdk1.6.0/jre/lib/${JDK_ARCH}
200
201 # fake j2sdk-image
202 rm ${BUILD_DIR_ECJ}/j2sdk-image/include || true
203 cp -ar ${BUILD_DIR_ECJ}/hotspot/import/include ${BUILD_DIR_ECJ}/j2sdk-image/
204 install -d ${BUILD_DIR_ECJ}/j2sdk-image/bin
205}
206addtask compilestepone after do_configure before do_compilesteptwo
207
208# This part can be shared between cacao and hotspot-zero builds.
209do_compilesteptwo() {
210 bbnote "2/3 Building bootstrap JDK"
211
212 # Now cross-compile bootstrap JDK
213 rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true
214 oe_runmake icedtea-against-ecj
215
216 ln -sf ../${BUILD_DIR_ECJ}/j2sdk-image bootstrap/icedtea
217
218 # Replace all executables with symlinks to their native equivalents.
219 for F in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin -type f`
220 do
221 bf=`basename $F`
222 bbnote "Creating symlink for:" $bf
223 ln -sf $F bootstrap/icedtea/bin/$bf
224 done
225}
226addtask compilesteptwo after do_compilestepone before do_compile
227
228do_compile() {
229
230 bbnote "3/3 Building final JDK"
231
232 # Build the final Hotspot + OpenJDK
233 oe_runmake icedtea-against-icedtea
234}
235
236do_install() {
237 install -d ${D}${libdir_jvm}
238 cp -R ${B}/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME}
239
240 chmod u+rw -R ${D}${JDK_HOME}
241
242 # Fix symlink which would point into staging in the binary package.
243 ln -sf ${datadir_java}/rhino.jar ${D}${JDK_HOME}/jre/lib/rhino.jar
244
245 # JRE is a subset of JDK. So to save space and resemble what the BIG distros
246 # do we create symlinks from the JDK binaries to their counterparts in the
247 # JRE folder (which have to exist by that time b/c of dependencies).
248 for F in `find ${D}${JDK_HOME}/jre/bin -type f`
249 do
250 bf=`basename $F`
251 bbnote "replace:" $bf
252 rm ${D}${JDK_HOME}/bin/$bf
253 ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf
254 done
255 install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/
256 # workaround for shared libarary searching
257 ln -sf ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/libjvm.so ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/
258}
259
260# Notes about the ideas behind packaging:
261# 1) User should install openjdk-6-jre. This is a provider of 'java2-runtime'.
262# 2) This lets package mgmt install: openjdk-6-java
263# -> openjdk-6-vm-shark|openjdk-6-vm-zero|openjdk-6-vm-cacao -> openjdk-6-common
264#
265# With opkg the zero VM is chosen which is good b/c that is the best known (= compatible)
266# runtime. Installing other runtimes side-by-side is possible. Through jvm.cfg the following
267# order of precedence is enforced: zero, shark, cacao. User can chose a different runtime
268# by adding '-shark' or '-cacao' to the Java command (or by deinstalling an otherwise preferred
269# runtime)
270# 3) All other packages, including -jdk, are optional and not needed for normal Java apps.
271PACKAGES = " \
272 ${JDKPN}-jre \
273 ${JDKPN}-dbg \
274 ${JDKPN}-demo-dbg \
275 ${JDKPN}-demo \
276 ${JDKPN}-source \
277 ${JDKPN}-doc \
278 ${JDKPN}-jdk \
279 ${JDKPN}-java \
280 ${JDKPN}-vm-shark \
281 ${JDKPN}-vm-zero \
282 ${JDKPN}-vm-cacao \
283 ${JDKPN}-vm-jamvm \
284 ${JDKPN}-common \
285 "
286
287FILES_${JDKPN}-dbg = "\
288 ${JDK_HOME}/bin/.debug \
289 ${JDK_HOME}/lib/.debug \
290 ${JDK_HOME}/jre/bin/.debug \
291 ${JDK_HOME}/jre/lib/.debug \
292 ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \
293 ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \
294 ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \
295 ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \
296 ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \
297 ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \
298 ${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/.debug \
299 ${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/.debug \
300 ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \
301 ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \
302 /usr/src \
303 "
304
305FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample"
306RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre"
307FILES_${JDKPN}-demo-dbg = "\
308 ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \
309 ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \
310 ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \
311 ${JDK_HOME}/demo/jvmti/hprof/lib/.debug \
312 ${JDK_HOME}/demo/jvmti/minst/lib/.debug \
313 ${JDK_HOME}/demo/jvmti/mtrace/lib/.debug \
314 ${JDK_HOME}/demo/jvmti/versionCheck/lib/.debug \
315 ${JDK_HOME}/demo/jvmti/waiters/lib/.debug \
316 ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \
317 "
318
319FILES_${JDKPN}-source = "${JDK_HOME}/src.zip"
320
321FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java"
322
323FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/"
324
325FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/"
326
327FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/"
328
329FILES_${JDKPN}-vm-jamvm = "${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/"
330
331FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \
332 ${JDK_HOME}/jre/THIRD_PARTY_README \
333 ${JDK_HOME}/jre/LICENSE \
334 ${JDK_HOME}/jre/lib \
335 "
336
337FILES_openjdk-6-jre_append = " \
338 ${JDK_HOME}/jre/bin/keytool \
339 ${JDK_HOME}/jre/bin/orbd \
340 ${JDK_HOME}/jre/bin/pack200 \
341 ${JDK_HOME}/jre/bin/rmid \
342 ${JDK_HOME}/jre/bin/rmiregistry \
343 ${JDK_HOME}/jre/bin/servertool \
344 ${JDK_HOME}/jre/bin/tnameserv \
345 ${JDK_HOME}/jre/bin/unpack200 \
346 ${JDK_HOME}/jre/bin/policytool \
347 ${JDK_HOME}/jre/bin/javaws \
348 "
349
350RDEPENDS_${JDKPN}-common = "librhino-java"
351
352RPROVIDES_${JDKPN}-vm-shark = "java2-vm"
353RPROVIDES_${JDKPN}-vm-zero = "java2-vm"
354RPROVIDES_${JDKPN}-vm-cacao = "java2-vm"
355RPROVIDES_${JDKPN}-vm-jamvm = "java2-vm"
356
357# Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled:
358# root@beaglebone:~/java# opkg remove openjdk-6-vm-shark
359# No packages removed.
360# Collected errors:
361# * print_dependents_warning: Package openjdk-6-vm-shark is depended upon by packages:
362# * print_dependents_warning: openjdk-6-java
363# * print_dependents_warning: These might cease to work if package openjdk-6-vm-shark is removed.
364RRECOMMENDS_${JDKPN}-java = "java2-vm"
365
366# For some reason shark and cacao do not automatically depends on -common.
367# So we add that manually.
368RDEPENDS_${JDKPN}-vm-shark = "${JDKPN}-common"
369RDEPENDS_${JDKPN}-vm-cacao = "${JDKPN}-common"
370RDEPENDS_${JDKPN}-vm-jamvm = "${JDKPN}-common"
371
372# There is a symlink to a .so but this one is valid.
373INSANE_SKIP_${JDKPN}-vm-shark = "dev-so"
374INSANE_SKIP_${JDKPN}-vm-zero = "dev-so"
375INSANE_SKIP_${JDKPN}-vm-cacao = "dev-so"
376INSANE_SKIP_${JDKPN}-vm-jamvm = "dev-so"
377INSANE_SKIP_${JDKPN}-common = "dev-so"
378
379FILES_${JDKPN}-jdk = " \
380 ${JDK_HOME}/bin \
381 ${JDK_HOME}/lib \
382 ${JDK_HOME}/include \
383 ${JDK_HOME}/ASSEMBLY_EXCEPTION \
384 ${JDK_HOME}/THIRD_PARTY_README \
385 ${JDK_HOME}/LICENSE \
386 "
387RDEPENDS_${JDKPN}-jre = "${JDKPN}-java"
388RPROVIDES_${JDKPN}-jre = "java2-runtime"
389
390RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre"
391
392FILES_${JDKPN}-doc = "${JDK_HOME}/man"
393
394require openjdk-postinst.inc
395
396ALTERNATIVE_PRIORITY = "20"
diff --git a/recipes-core/openjdk/openjdk-6-release-6b24.inc b/recipes-core/openjdk/openjdk-6-release-6b24.inc
deleted file mode 100644
index da5299f..0000000
--- a/recipes-core/openjdk/openjdk-6-release-6b24.inc
+++ /dev/null
@@ -1,149 +0,0 @@
1require openjdk-6-common.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4
5FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b24:"
6
7# needed for dis-asm.h
8DEPENDS += "binutils"
9
10EXTRA_OECONF += "\
11 --with-jdk-home=${WORKDIR}/fake-jdk \
12 --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \
13 --with-jaxws-drop-zip=${DL_DIR}/${JAXWS_FILE} \
14 --with-jaf-drop-zip=${DL_DIR}/${JAF_FILE} \
15 --with-jaxp-drop-zip=${DL_DIR}/${JAXP_FILE} \
16 --with-cacao-src-zip=${DL_DIR}/${CACAO_VERSION}.tar.gz \
17 --with-jamvm-src-zip=${DL_DIR}/jamvm-${JAMVM_VERSION}.tar.gz \
18 --with-openjdk-src-zip=${DL_DIR}/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz \
19"
20
21# List of additional JVM to include in the build, shark is disabled since 1.11.1
22WITH_ADDITIONAL_VMS = "cacao,jamvm"
23
24# Name of the directory containing the compiled output
25BUILD_DIR = "openjdk.build"
26BUILD_DIR_ECJ = "openjdk.build-ecj"
27
28# Force arm mode for now
29ARM_INSTRUCTION_SET_armv4t = "ARM"
30
31ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced"
32
33OPENJDK_VERSION = "b24"
34OPENJDK_DATE = "14_nov_2011"
35OPENJDK_URI = "http://download.java.net/openjdk/jdk6/promoted/${OPENJDK_VERSION}/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz;subdir=openjdk-src-dir;name=openjdk;unpack=false"
36SRC_URI[openjdk.md5sum] = "0eabdd360169144336e50081b8d01001"
37SRC_URI[openjdk.sha256sum] = "f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227"
38
39JAXWS_FILE = "jdk6-jaxws2_1_6-2011_06_13.zip"
40JAXWS_URI = "http://icedtea.wildebeest.org/download/drops/${JAXWS_FILE};name=jaxws;unpack=false"
41SRC_URI[jaxws.md5sum] = "8fd91b09b643a19a912b8a75e7a7a9d5"
42SRC_URI[jaxws.sha256sum] = "229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3"
43
44JAF_FILE = "jdk6-jaf-b20.zip"
45JAF_URI = "http://icedtea.wildebeest.org/download/drops/${JAF_FILE};name=jaf;unpack=false"
46SRC_URI[jaf.md5sum] = "bc95c133620bd68c161cac9891592901"
47SRC_URI[jaf.sha256sum] = "78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012"
48
49JAXP_FILE = "jaxp144_03.zip"
50JAXP_URI = "http://icedtea.wildebeest.org/download/drops/${JAXP_FILE};name=jaxp;unpack=false"
51SRC_URI[jaxp.md5sum] = "9eea471ad474040265c688858fcf09aa"
52SRC_URI[jaxp.sha256sum] = "c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012"
53
54CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_VERSION}.tar.gz;name=cacao;unpack=false"
55CACAO_VERSION = "cff92704c4e0"
56SRC_URI[cacao.md5sum] = "40b811b8b7f01b51cd21e62255691bc7"
57SRC_URI[cacao.sha256sum] = "dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f"
58
59JAMVM_URI = "http://icedtea.wildebeest.org/download/drops/jamvm/jamvm-${JAMVM_VERSION}.tar.gz;name=jamvm;unpack=false"
60JAMVM_VERSION = "4617da717ecb05654ea5bb9572338061106a414d"
61SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b"
62SRC_URI[jamvm.sha256sum] = "47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d"
63
64# Allow overriding this separately
65OEPATCHES = "\
66 file://build-hacks.patch \
67 file://cacao-libtoolize.patch \
68 file://cacao-loadavg-makefile.patch \
69 file://fix_hotspot_crosscompile.patch \
70 file://cacao-loadavg.patch;apply=no \
71 file://cacao-arm-ucontext.patch;apply=no \
72 "
73
74# Allow overriding this separately
75ICEDTEAPATCHES = "\
76 file://icedtea-launcher-stdc++.patch;apply=no \
77 file://icedtea-crosscompile-fix.patch;apply=no \
78 file://icedtea-hostbuildcc.patch;apply=no \
79 file://icedtea-unbreak-float.patch;apply=no \
80 file://icedtea-remove_werror.patch;apply=no \
81 file://icedtea-libnet-renaming.patch;apply=no \
82 file://icedtea-fix-xrender.patch;apply=no \
83 file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \
84 file://icedtea-zero-hotspotfix.patch;apply=no \
85 file://icedtea-jdk-powerpc-atomic64.patch;apply=no \
86 "
87ICEDTEAPATCHES_append_e5500-64b = " \
88 file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \
89 "
90ICEDTEAPATCHES_append_e5500 = " \
91 file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \
92 "
93ICEDTEAPATCHES_append_e6500-64b = " \
94 file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \
95 "
96ICEDTEAPATCHES_append_e6500 = " \
97 file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \
98 "
99
100ICEDTEAPATCHES_append_libc-uclibc = " \
101 file://icedtea-hotspot-isfinte.patch;apply=no \
102 file://icedtea-hotspot-glibc-version.patch;apply=no \
103 file://icedtea-hotspot-loadavg.patch;apply=no \
104 file://icedtea-hotspot-isnanf.patch;apply=no \
105 file://icedtea-jdk-iconv-uclibc.patch;apply=no \
106 file://icedtea-jdk-remove-unused-backtrace.patch;apply=no \
107 file://icedtea-jdk-unpack-uclibc.patch;apply=no \
108 file://icedtea-hotspot-dlvsym-uclibc.patch;apply=no \
109 "
110
111# Allow overriding this separately
112DISTRIBUTION_PATCHES = "\
113 patches/icedtea-launcher-stdc++.patch \
114 patches/icedtea-crosscompile-fix.patch \
115 patches/icedtea-hostbuildcc.patch \
116 patches/icedtea-unbreak-float.patch \
117 patches/icedtea-remove_werror.patch \
118 patches/icedtea-libnet-renaming.patch \
119 patches/icedtea-fix-xrender.patch \
120 patches/icedtea-shark-arm-linux-cpu-detection.patch \
121 patches/icedtea-zero-hotspotfix.patch \
122 patches/icedtea-jdk-powerpc-atomic64.patch \
123 "
124
125DISTRIBUTION_PATCHES_append_libc-uclibc = "\
126 patches/icedtea-hotspot-isfinte.patch \
127 patches/icedtea-hotspot-isnanf.patch \
128 patches/icedtea-hotspot-glibc-version.patch \
129 patches/icedtea-hotspot-loadavg.patch \
130 patches/icedtea-jdk-iconv-uclibc.patch \
131 patches/icedtea-jdk-remove-unused-backtrace.patch \
132 patches/icedtea-jdk-unpack-uclibc.patch \
133 patches/icedtea-hotspot-dlvsym-uclibc.patch \
134 "
135DISTRIBUTION_PATCHES_append_e5500-64b = " \
136 patches/icedtea-jdk-sizers-crosscompile-hack.patch \
137 "
138
139DISTRIBUTION_PATCHES_append_e5500 = " \
140 patches/icedtea-jdk-sizers-crosscompile-hack.patch \
141 "
142DISTRIBUTION_PATCHES_append_e6500-64b = " \
143 patches/icedtea-jdk-sizers-crosscompile-hack.patch \
144 "
145
146DISTRIBUTION_PATCHES_append_e6500 = " \
147 patches/icedtea-jdk-sizers-crosscompile-hack.patch \
148 "
149export DISTRIBUTION_PATCHES
diff --git a/recipes-core/openjdk/openjdk-6-release-6b27.inc b/recipes-core/openjdk/openjdk-6-release-6b27.inc
deleted file mode 100644
index eddb4e4..0000000
--- a/recipes-core/openjdk/openjdk-6-release-6b27.inc
+++ /dev/null
@@ -1,31 +0,0 @@
1require openjdk-6-release-6b24.inc
2
3FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b27:"
4
5EXTRA_OECONF += "--disable-downloading"
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
25ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no \
26 file://icedtea-disable-sane-alsa.patch;apply=no \
27 "
28
29DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch \
30 patches/icedtea-disable-sane-alsa.patch \
31 "
diff --git a/recipes-core/openjdk/openjdk-6-release-6b32.inc b/recipes-core/openjdk/openjdk-6-release-6b32.inc
deleted file mode 100644
index c1badcb..0000000
--- a/recipes-core/openjdk/openjdk-6-release-6b32.inc
+++ /dev/null
@@ -1,36 +0,0 @@
1require openjdk-6-release-6b27.inc
2
3DEPENDS += "krb5 libxslt-native"
4
5FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b32:"
6
7ICEDTEAPATCHES += "file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no"
8
9EXTRA_OECONF += "--disable-downloading \
10 --enable-system-zlib \
11 --enable-system-jpeg \
12 --enable-system-png \
13 --enable-system-gif \
14 --disable-system-lcms \
15 "
16do_configure_append () {
17 patch -p0 <${WORKDIR}/icedtea-openjdk-remove-currency-data-generation-expi.patch
18 cd openjdk-ecj
19 patch -p1 <${WORKDIR}/icedtea-openjdk-remove-currency-data-generation-expi.patch
20 cd ..
21}
22
23OPENJDK_VERSION = "b32"
24OPENJDK_DATE = "15_jul_2014"
25#https://java.net/projects/openjdk6/downloads/download/openjdk-6-src-b31-15_apr_2014.tar.gz
26OPENJDK_URI = "https://java.net/projects/openjdk6/downloads/download/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz;subdir=openjdk-src-dir;name=openjdk;unpack=false"
27SRC_URI[openjdk.md5sum] = "a97c28256a61be76e3047c31e0349c04"
28SRC_URI[openjdk.sha256sum] = "fe1eb7053fddfd325152f95f9719325e4ba67534a26fa690ca24fab75461a1fa"
29
30JAMVM_VERSION = "ec18fb9e49e62dce16c5094ef1527eed619463aa"
31SRC_URI[jamvm.md5sum] = "d50ae193d01a9251e10679c7a2cc6ff1"
32SRC_URI[jamvm.sha256sum] = "31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc"
33
34JAXP_FILE = "jaxp144_04.zip"
35SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd"
36SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c"
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 @@
1Index: icedtea6-1.8/Makefile.am
2===================================================================
3--- icedtea6-1.8.orig/Makefile.am 2010-04-12 23:55:51.754838172 +0200
4+++ icedtea6-1.8/Makefile.am 2010-06-16 15:17:10.224708601 +0200
5@@ -477,6 +477,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 DISTRIBUTION_ID="$(DIST_ID)" \
15 DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
16 DEBUG_CLASSFILES="true" \
17Index: icedtea6-1.8/javac.in
18===================================================================
19--- icedtea6-1.8.orig/javac.in 2010-03-25 15:10:41.714835519 +0100
20+++ icedtea6-1.8/javac.in 2010-06-16 15:14:31.205334756 +0200
21@@ -35,7 +35,9 @@
22 elif [ ! -z "@ECJ@" ] ; then
23 @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS
24 else
25+ # Compiling hotspot-tools consumes tons of memory and exceeds any default
26+ # limits for jamvm and cacao.
27 CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
28- @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
29+ @JAVA@ -Xmx1024m org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
30 fi
31
diff --git a/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch b/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch
deleted file mode 100644
index d676142..0000000
--- a/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: cacao/cacao/src/mm/boehm-gc/os_dep.c
2===================================================================
3--- cacao/cacao/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:15.000000000 +0100
4+++ cacao/cacao/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:24.000000000 +0100
5@@ -1077,7 +1077,6 @@
6 c = stat_buf[buf_offset++];
7 }
8 close(f);
9- if (result < 0x10000000) ABORT("Absurd stack bottom value");
10 return (ptr_t)result;
11 }
12
diff --git a/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch
deleted file mode 100644
index a153a32..0000000
--- a/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Index: icedtea6-1.8.5/Makefile.am
2===================================================================
3--- icedtea6-1.8.5.orig/Makefile.am 2011-02-04 18:29:58.826701224 +0100
4+++ icedtea6-1.8.5/Makefile.am 2011-02-04 18:31:53.430016002 +0100
5@@ -1918,10 +1918,13 @@
6 if BUILD_CACAO
7 if !USE_SYSTEM_CACAO
8 cd cacao/cacao && \
9+ rm -f libtool && \
10+ autoreconf --verbose --install --force --no-recursive && \
11 $(ARCH_PREFIX) ./configure \
12 --host=$(host_alias) \
13 --build=$(build_alias) \
14 --target=$(target_alias) \
15+ --with-libtool-sysroot \
16 --prefix=$(abs_top_builddir)/cacao/install \
17 --with-java-runtime-library=openjdk \
18 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
diff --git a/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch b/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch
deleted file mode 100644
index 09ba984..0000000
--- a/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Index: cacao/cacao/src/vm/jit/arm/codegen.c
2===================================================================
3--- cacao/cacao/src/vm/jit/arm/codegen.c 2008-10-01 16:23:21.439856241 +0200
4+++ cacao/cacao/src/vm/jit/arm/codegen.c 2008-10-01 16:41:24.278841537 +0200
5@@ -2353,10 +2353,12 @@
6
7 d = md->returntype.type;
8
9-#if !defined(__SOFTFP__)
10+#if !defined(__SOFTFP__) && !defined(__VFP_FP__)
11 /* TODO: this is only a hack, since we use R0/R1 for float
12 return! this depends on gcc; it is independent from
13- our ENABLE_SOFTFLOAT define */
14+ our ENABLE_SOFTFLOAT define
15+ It is only needed for -mfpu=fpa -mfloat-abi=hard!
16+ */
17 if (iptr->opc == ICMD_BUILTIN && d != TYPE_VOID && IS_FLT_DBL_TYPE(d)) {
18 #if 0 && !defined(NDEBUG)
19 dolog("BUILTIN that returns float or double (%s.%s)", m->clazz->name->text, m->name->text);
20@@ -3019,7 +3021,7 @@
21 s1 = (s4) (cd->mcodeptr - cd->mcodebase);
22 M_RECOMPUTE_PV(s1);
23
24-#if !defined(__SOFTFP__)
25+#if !defined(__SOFTFP__) && !defined(__VFP_FP__)
26 /* TODO: this is only a hack, since we use R0/R1 for float return! */
27 /* this depends on gcc; it is independent from our ENABLE_SOFTFLOAT define */
28 if (md->returntype.type != TYPE_VOID && IS_FLT_DBL_TYPE(md->returntype.type)) {
29@@ -3030,7 +3032,7 @@
30 /* M_CAST_FLT_TO_INT_TYPED(md->returntype.type, REG_FRESULT, REG_RESULT_TYPED(md->returntype.type)); */
31 if (IS_2_WORD_TYPE(md->returntype.type)) {
32 DCD(0xed2d8102); /* stfd f0, [sp, #-8]! */
33- M_LDRD_UPDATE(REG_RESULT_PACKED, REG_SP, 8);
34+ M_LDRD_UPDATE(REG_RESULT_PACKED, REG_SP, 8);
35 } else {
36 DCD(0xed2d0101); /* stfs f0, [sp, #-4]!*/
37 M_LDR_UPDATE(REG_RESULT, REG_SP, 4);
diff --git a/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch b/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch
deleted file mode 100644
index 7c82daf..0000000
--- a/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea6-1.8/configure.ac
2===================================================================
3--- icedtea6-1.8.orig/configure.ac
4+++ icedtea6-1.8/configure.ac
5@@ -472,7 +472,7 @@
6 if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then
7 continue
8 fi
9- if echo "$flag" | grep -q '^-l'; then
10+ if echo "$flag" | grep -q '^-l\|.so'; then
11 if test "x$LLVM_LIBS" != "x"; then
12 LLVM_LIBS="$LLVM_LIBS "
13 fi
diff --git a/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch
deleted file mode 100644
index 3d4a68c..0000000
--- a/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch
+++ /dev/null
@@ -1,94 +0,0 @@
1Index: icedtea6-1.8/Makefile.am
2===================================================================
3--- icedtea6-1.8.orig/Makefile.am 2010-06-18 12:31:34.534667003 +0200
4+++ icedtea6-1.8/Makefile.am 2010-06-18 12:31:34.714667729 +0200
5@@ -488,6 +488,7 @@
6 DEBUG_BINARIES="true" \
7 ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
8 VERBOSE="$(VERBOSE)" \
9+ CC_FOR_BUILD="$(CC_FOR_BUILD)" \
10 ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
11 ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect"
12
13Index: icedtea6-1.8/acinclude.m4
14===================================================================
15--- icedtea6-1.8.orig/acinclude.m4 2010-04-10 21:58:40.804836529 +0200
16+++ icedtea6-1.8/acinclude.m4 2010-06-18 12:31:34.714667729 +0200
17@@ -900,6 +900,21 @@
18 AC_SUBST(ALT_CACAO_SRC_DIR)
19 ])
20
21+AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD],
22+[
23+ AC_MSG_CHECKING(for compiler used for subsidiary programs)
24+ AC_ARG_WITH([cc-for-build],
25+ [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)],
26+ [
27+ CC_FOR_BUILD="${withval}"
28+ ],
29+ [
30+ CC_FOR_BUILD="\$(CC)"
31+ ])
32+ AC_MSG_RESULT(${CC_FOR_BUILD})
33+ AC_SUBST(CC_FOR_BUILD)
34+])
35+
36 AC_DEFUN([AC_CHECK_WITH_GCJ],
37 [
38 AC_MSG_CHECKING([whether to compile ecj natively])
39Index: icedtea6-1.8/configure.ac
40===================================================================
41--- icedtea6-1.8.orig/configure.ac 2010-04-12 13:46:18.821086023 +0200
42+++ icedtea6-1.8/configure.ac 2010-06-18 12:31:34.724666321 +0200
43@@ -44,6 +44,7 @@
44 IT_CHECK_FOR_MERCURIAL
45 IT_OBTAIN_HG_REVISIONS
46 AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
47+AC_CHECK_WITH_CC_FOR_BUILD
48 AC_CHECK_WITH_GCJ
49 AC_CHECK_WITH_HOTSPOT_BUILD
50 AC_PATH_TOOL([LINUX32],[linux32])
51Index: icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make
52===================================================================
53--- icedtea6-1.8.orig/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-03-25 15:10:42.061085966 +0100
54+++ icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-06-18 12:40:42.834666505 +0200
55@@ -32,6 +32,13 @@
56 Obj_Files += thumb2.o
57
58 CFLAGS += -DHOTSPOT_ASM
59+CCFLAGS += -DHOTSPOT_ASM
60+
61+ifeq ($(CROSS_COMPILATION), true)
62+ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD)
63+else
64+ C_COMPILE_FOR_MKBC = $(C_COMPILE)
65+endif
66
67 %.o: %.S
68 @echo Assembling $<
69@@ -43,20 +50,20 @@
70
71 offsets_arm.s: mkoffsets
72 @echo Generating assembler offsets
73- ./mkoffsets > $@
74+ $(QEMU) ./mkoffsets > $@
75
76 bytecodes_arm.s: bytecodes_arm.def mkbc
77 @echo Generatine ARM assembler bytecode sequences
78 $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
79
80-mkbc: $(GAMMADIR)/tools/mkbc.c
81+mkbc: $(GAMMADIR)/tools/mkbc.c
82 @echo Compiling mkbc tool
83- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
84+ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE)
85
86-mkoffsets: asm_helper.cpp
87+mkoffsets: asm_helper.cpp
88 @echo Compiling offset generator
89 $(QUIETLY) $(REMOVE_TARGET)
90- $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
91+ $(CC_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
92
93 endif
94
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch
deleted file mode 100644
index 6ec83bb..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch
+++ /dev/null
@@ -1,229 +0,0 @@
1Index: openjdk/jdk/make/sun/awt/Makefile
2===================================================================
3--- openjdk.orig/jdk/make/sun/awt/Makefile 2009-01-24 17:54:57.000000000 +0100
4+++ openjdk/jdk/make/sun/awt/Makefile 2009-01-24 17:55:07.000000000 +0100
5@@ -509,10 +509,10 @@
6 #
7
8 ifeq ($(PLATFORM), linux)
9-CPPFLAGS += -I$(MOTIF_DIR)/include \
10- -I$(OPENWIN_HOME)/include \
11- -I$(OPENWIN_HOME)/include/X11/extensions \
12- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
13+#CPPFLAGS += -I$(MOTIF_DIR)/include \
14+# -I$(OPENWIN_HOME)/include \
15+# -I$(OPENWIN_HOME)/include/X11/extensions \
16+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
17 endif
18 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
19 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
20@@ -536,7 +536,7 @@
21 $(EVENT_MODEL)
22
23 ifeq ($(PLATFORM), linux)
24-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
25+#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
26 endif
27
28 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
29Index: openjdk/jdk/make/sun/awt/mawt.gmk
30===================================================================
31--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:54:57.000000000 +0100
32+++ openjdk/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:55:07.000000000 +0100
33@@ -194,8 +194,8 @@
34 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
35
36 ifndef HEADLESS
37-CPPFLAGS += -I$(OPENWIN_HOME)/include
38-LDFLAGS += -L$(OPENWIN_LIB)
39+#CPPFLAGS += -I$(OPENWIN_HOME)/include
40+#LDFLAGS += -L$(OPENWIN_LIB)
41
42 endif # !HEADLESS
43
44@@ -223,8 +223,8 @@
45
46 ifeq ($(PLATFORM), linux)
47 # Checking for the X11/extensions headers at the additional location
48- CPPFLAGS += -I/X11R6/include/X11/extensions \
49- -I/usr/include/X11/extensions
50+# CPPFLAGS += -I/X11R6/include/X11/extensions \
51+# -I/usr/include/X11/extensions
52 endif
53
54 ifeq ($(PLATFORM), solaris)
55Index: openjdk/jdk/make/sun/xawt/Makefile
56===================================================================
57--- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-01-24 17:54:57.000000000 +0100
58+++ openjdk/jdk/make/sun/xawt/Makefile 2009-01-24 17:55:07.000000000 +0100
59@@ -123,11 +123,12 @@
60 -I$(PLATFORM_SRC)/native/sun/awt
61
62 ifeq ($(PLATFORM), linux)
63+# Very unsuitable for cross-compilation.
64 # Allows for builds on Debian GNU Linux, X11 is in a different place
65- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
66- -I/usr/include/X11/extensions \
67- -I$(MOTIF_DIR)/include \
68- -I$(OPENWIN_HOME)/include
69+# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
70+# -I/usr/include/X11/extensions \
71+# -I$(MOTIF_DIR)/include \
72+# -I$(OPENWIN_HOME)/include
73 endif
74
75 ifeq ($(PLATFORM), solaris)
76Index: openjdk/hotspot/make/linux/makefiles/vm.make
77===================================================================
78--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:54:57.000000000 +0100
79+++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:55:07.000000000 +0100
80@@ -170,6 +170,7 @@
81 LIBS_VM += $(LLVM_LIBS)
82 endif
83
84+LFLAGS_VM += $(OE_LDFLAGS)
85 LINK_VM = $(LINK_LIB.c)
86
87 # rule for building precompiled header
88Index: openjdk/hotspot/make/linux/makefiles/buildtree.make
89===================================================================
90--- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:54:57.000000000 +0100
91+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:55:07.000000000 +0100
92@@ -343,7 +343,7 @@
93 echo "rm -f Queens.class"; \
94 echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
95 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
96- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
97+ echo 'echo Silently skipping the execution of the gamma program'; \
98 ) > $@
99 $(QUIETLY) chmod +x $@
100
101Index: openjdk/corba/make/common/Defs-linux.gmk
102===================================================================
103--- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100
104+++ openjdk/corba/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100
105@@ -82,9 +82,9 @@
106 CC_NO_OPT =
107
108 ifeq ($(PRODUCT), java)
109- _OPT = $(CC_HIGHER_OPT)
110+ _OPT = $(OE_CFLAGS)
111 else
112- _OPT = $(CC_LOWER_OPT)
113+ _OPT = $(OE_CFLAGS)
114 CPPFLAGS_DBG += -DLOGGING
115 endif
116
117@@ -94,7 +94,7 @@
118 # as the default.
119 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
120 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
121-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
122+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
123 CFLAGS_REQUIRED_hppa +=
124 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
125 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
126@@ -221,7 +221,7 @@
127 #
128 # -L paths for finding and -ljava
129 #
130-LDFLAGS_OPT = -Xlinker -O1
131+LDFLAGS_OPT = $(OE_LDFLAGS)
132 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
133 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
134
135Index: openjdk/jdk/make/common/Defs-linux.gmk
136===================================================================
137--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100
138+++ openjdk/jdk/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100
139@@ -92,9 +92,9 @@
140 CC_NO_OPT =
141
142 ifeq ($(PRODUCT), java)
143- _OPT = $(CC_HIGHER_OPT)
144+ _OPT = $(OE_CFLAGS)
145 else
146- _OPT = $(CC_LOWER_OPT)
147+ _OPT = $(OE_CFLAGS)
148 CPPFLAGS_DBG += -DLOGGING
149 endif
150
151@@ -104,7 +104,7 @@
152 # as the default.
153 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
154 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
155-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
156+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
157 CFLAGS_REQUIRED_hppa +=
158 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
159 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
160@@ -231,7 +231,7 @@
161 #
162 # -L paths for finding and -ljava
163 #
164-LDFLAGS_OPT = -Xlinker -O1
165+LDFLAGS_OPT = $(OE_LDFLAGS)
166 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
167 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
168
169Index: openjdk/hotspot/make/linux/makefiles/gcc.make
170===================================================================
171--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:54:57.000000000 +0100
172+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:55:07.000000000 +0100
173@@ -119,7 +119,7 @@
174 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
175
176 # The flags to use for an Optimized g++ build
177-OPT_CFLAGS += -O3
178+OPT_CFLAGS += $(OE_CFLAGS)
179
180 # Hotspot uses very unstrict aliasing turn this optimization off
181 OPT_CFLAGS += -fno-strict-aliasing
182@@ -148,7 +148,7 @@
183 endif
184
185 # Enable linker optimization
186-LFLAGS += -Xlinker -O1
187+LFLAGS += $(OE_LDFLAGS)
188
189 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
190 MAPFLAG = -Xlinker --version-script=FILENAME
191Index: openjdk/hotspot/make/linux/makefiles/launcher.make
192===================================================================
193--- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:55:19.000000000 +0100
194+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:56:05.000000000 +0100
195@@ -44,7 +44,7 @@
196 LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
197 else
198 LAUNCHER.o = launcher.o
199- LFLAGS_LAUNCHER += -L `pwd`
200+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS)
201 LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
202 endif
203
204Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile
205===================================================================
206--- openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:17:03.926207269 +0100
207+++ openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:30:11.956186631 +0100
208@@ -245,7 +245,7 @@
209 $(CHMOD) +w $@;\
210 else \
211 $(ECHO) GENERATING $@; \
212- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
213+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
214 fi
215 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
216 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
217Index: openjdk/hotspot/make/linux/makefiles/jsig.make
218===================================================================
219--- openjdk/hotspot/make/linux/makefiles/jsig.make 2010-02-17 04:11:04.000000000 +0100
220+++ openjdk/hotspot/make/linux/makefiles/jsig.make 2011-11-18 22:56:03.923900991 +0100
221@@ -39,7 +39,7 @@
222 # cause problems with interposing. See CR: 6466665
223 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
224
225-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT
226+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(OE_LDFLAGS)
227
228 # DEBUG_BINARIES overrides everything, use full -g debug information
229 ifeq ($(DEBUG_BINARIES), true)
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch b/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch
deleted file mode 100644
index 59d806d..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea6-1.8/Makefile.am
2===================================================================
3--- icedtea6-1.8.orig/Makefile.am 2010-06-17 10:29:13.654666801 +0200
4+++ icedtea6-1.8/Makefile.am 2010-06-17 10:30:50.334670771 +0200
5@@ -1750,7 +1745,7 @@
6 stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
7 if WITH_RHINO
8 mkdir -p rhino/rhino.{old,new}
9- (cd rhino/rhino.old ; jar xf $(RHINO_JAR))
10+ (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR))
11 $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
12 com.redhat.rewriter.ClassRewriter \
13 $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch b/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch
deleted file mode 100644
index 01dcb82..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch
+++ /dev/null
@@ -1,131 +0,0 @@
1Index: openjdk/jdk/src/share/classes/javax/swing/HasGetTransferHandler.java
2===================================================================
3--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4+++ openjdk/jdk/src/share/classes/javax/swing/HasGetTransferHandler.java 2011-11-18 20:44:00.281649848 +0100
5@@ -0,0 +1,38 @@
6+/*
7+ * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
8+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9+ *
10+ * This code is free software; you can redistribute it and/or modify it
11+ * under the terms of the GNU General Public License version 2 only, as
12+ * published by the Free Software Foundation. Sun designates this
13+ * particular file as subject to the "Classpath" exception as provided
14+ * by Sun in the LICENSE file that accompanied this code.
15+ *
16+ * This code is distributed in the hope that it will be useful, but WITHOUT
17+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
18+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
19+ * version 2 for more details (a copy is included in the LICENSE file that
20+ * accompanied this code).
21+ *
22+ * You should have received a copy of the GNU General Public License version
23+ * 2 along with this work; if not, write to the Free Software Foundation,
24+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
25+ *
26+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
27+ * CA 95054 USA or visit www.sun.com if you need additional information or
28+ * have any questions.
29+ */
30+package javax.swing;
31+
32+/**
33+ * An interface to tag things with a {@code getTransferHandler} method.
34+ */
35+interface HasGetTransferHandler {
36+
37+ /** Returns the {@code TransferHandler}.
38+ *
39+ * @return The {@code TransferHandler} or {@code null}
40+ */
41+ public TransferHandler getTransferHandler();
42+}
43+
44Index: openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java
45===================================================================
46--- openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java 2011-11-18 18:51:22.000000000 +0100
47+++ openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java 2011-11-18 20:44:01.628219313 +0100
48@@ -122,18 +122,6 @@
49 public static final int LINK = DnDConstants.ACTION_LINK;
50
51 /**
52- * An interface to tag things with a {@code getTransferHandler} method.
53- */
54- interface HasGetTransferHandler {
55-
56- /** Returns the {@code TransferHandler}.
57- *
58- * @return The {@code TransferHandler} or {@code null}
59- */
60- public TransferHandler getTransferHandler();
61- }
62-
63- /**
64 * Represents a location where dropped data should be inserted.
65 * This is a base class that only encapsulates a point.
66 * Components supporting drop may provide subclasses of this
67diff --git a/jdk/src/share/classes/javax/swing/JApplet.java b/jdk/src/share/classes/javax/swing/JApplet.java
68index 47f792a..72c2cf9 100644
69--- openjdk/jdk/src/share/classes/javax/swing/JApplet.java
70+++ openjdk/jdk/src/share/classes/javax/swing/JApplet.java
71@@ -91,7 +91,7 @@ import javax.accessibility.*;
72 */
73 public class JApplet extends Applet implements Accessible,
74 RootPaneContainer,
75- TransferHandler.HasGetTransferHandler
76+ HasGetTransferHandler
77 {
78 /**
79 * @see #getRootPane
80diff --git a/jdk/src/share/classes/javax/swing/JComponent.java b/jdk/src/share/classes/javax/swing/JComponent.java
81index 4293a4f..0c0a1dc 100644
82--- openjdk/jdk/src/share/classes/javax/swing/JComponent.java
83+++ openjdk/jdk/src/share/classes/javax/swing/JComponent.java
84@@ -171,7 +171,7 @@ import sun.swing.UIClientPropertyKey;
85 * @author Arnaud Weber
86 */
87 public abstract class JComponent extends Container implements Serializable,
88- TransferHandler.HasGetTransferHandler
89+ HasGetTransferHandler
90 {
91 /**
92 * @see #getUIClassID
93diff --git a/jdk/src/share/classes/javax/swing/JDialog.java b/jdk/src/share/classes/javax/swing/JDialog.java
94index a0193d1..aeeb243 100644
95--- openjdk/jdk/src/share/classes/javax/swing/JDialog.java
96+++ openjdk/jdk/src/share/classes/javax/swing/JDialog.java
97@@ -97,7 +97,7 @@ import javax.accessibility.*;
98 public class JDialog extends Dialog implements WindowConstants,
99 Accessible,
100 RootPaneContainer,
101- TransferHandler.HasGetTransferHandler
102+ HasGetTransferHandler
103 {
104 /**
105 * Key into the AppContext, used to check if should provide decorations
106diff --git a/jdk/src/share/classes/javax/swing/JFrame.java b/jdk/src/share/classes/javax/swing/JFrame.java
107index 9910b43..4cb8f58 100644
108--- openjdk/jdk/src/share/classes/javax/swing/JFrame.java
109+++ openjdk/jdk/src/share/classes/javax/swing/JFrame.java
110@@ -109,7 +109,7 @@ import javax.accessibility.*;
111 public class JFrame extends Frame implements WindowConstants,
112 Accessible,
113 RootPaneContainer,
114- TransferHandler.HasGetTransferHandler
115+ HasGetTransferHandler
116 {
117 /**
118 * The exit application default window close operation. If a window
119diff --git a/jdk/src/share/classes/javax/swing/JWindow.java b/jdk/src/share/classes/javax/swing/JWindow.java
120index c94803c..85bbb57 100644
121--- openjdk/jdk/src/share/classes/javax/swing/JWindow.java
122+++ openjdk/jdk/src/share/classes/javax/swing/JWindow.java
123@@ -91,7 +91,7 @@ import javax.accessibility.*;
124 */
125 public class JWindow extends Window implements Accessible,
126 RootPaneContainer,
127- TransferHandler.HasGetTransferHandler
128+ HasGetTransferHandler
129 {
130 /**
131 * The <code>JRootPane</code> instance that manages the
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch
deleted file mode 100644
index 5f2c98b..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/rules.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:22:33.201668748 +0100
4+++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:23:08.480415783 +0100
5@@ -39,6 +39,7 @@
6 # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
7 C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
8 CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
9+CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS)
10
11 AS.S = $(AS) $(ASFLAGS)
12
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch
deleted file mode 100644
index faa90ea..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200
5@@ -49,7 +49,6 @@
6 # include <string.h>
7 # include <syscall.h>
8 # include <sys/sysinfo.h>
9-# include <gnu/libc-version.h>
10 # include <sys/ipc.h>
11 # include <sys/shm.h>
12 # include <link.h>
13@@ -544,9 +543,7 @@
14 os::Linux::set_glibc_version(str);
15 } else {
16 // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
17- static char _gnu_libc_version[32];
18- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
19- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
20+ static char _gnu_libc_version[32] = "2.9";
21 os::Linux::set_glibc_version(_gnu_libc_version);
22 }
23
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch
deleted file mode 100644
index 7c5da59..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
2===================================================================
3--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:28.576131825 +0200
4+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:55.555711815 +0200
5@@ -235,8 +235,8 @@
6
7 // Checking for finiteness
8
9-inline int g_isfinite(jfloat f) { return finite(f); }
10-inline int g_isfinite(jdouble f) { return finite(f); }
11+inline int g_isfinite(jfloat f) { return isfinite(f); }
12+inline int g_isfinite(jdouble f) { return isfinite(f); }
13
14
15 // Wide characters
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch
deleted file mode 100644
index 494e965..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
2===================================================================
3--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:47:12.695674808 +0200
4+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:48:08.699007491 +0200
5@@ -220,14 +220,14 @@
6 // checking for nanness
7 #ifdef SOLARIS
8 #ifdef SPARC
9-inline int g_isnan(float f) { return isnanf(f); }
10+inline int g_isnan(float f) { return __isnanf(f); }
11 #else
12 // isnanf() broken on Intel Solaris use isnand()
13 inline int g_isnan(float f) { return isnand(f); }
14 #endif
15 inline int g_isnan(double f) { return isnand(f); }
16 #elif LINUX
17-inline int g_isnan(float f) { return isnanf(f); }
18+inline int g_isnan(float f) { return __isnanf(f); }
19 inline int g_isnan(double f) { return isnan(f); }
20 #else
21 #error "missing platform-specific definition here"
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch
deleted file mode 100644
index 7da41fd..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200
5@@ -4325,7 +4325,22 @@
6 // Linux doesn't yet have a (official) notion of processor sets,
7 // so just return the system wide load average.
8 int os::loadavg(double loadavg[], int nelem) {
9- return ::getloadavg(loadavg, nelem);
10+
11+ FILE *LOADAVG;
12+ double avg[3] = { 0.0, 0.0, 0.0 };
13+ int i, res = -1;;
14+
15+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
16+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
17+ res = 0;
18+ fclose(LOADAVG);
19+ }
20+
21+ for (i = 0; (i < nelem) && (i < 3); i++) {
22+ loadavg[i] = avg[i];
23+ }
24+
25+ return res;
26 }
27
28 void os::pause() {
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch
deleted file mode 100644
index 9c70ba1..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
2===================================================================
3--- openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-13 15:18:05.655136951 +0200
4+++ openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-13 15:20:29.601377967 +0200
5@@ -51,7 +51,7 @@
6 {
7 const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
8 // look up existing handle only, do not load
9- void *hModule = dlopen(libName, RTLD_NOLOAD);
10+ void *hModule = dlopen(libName, RTLD_LAZY);
11 dprintf2("-handle for %s: %u\n", libName, hModule);
12 (*env)->ReleaseStringUTFChars(env, jLibName, libName);
13 return (jlong)hModule;
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch
deleted file mode 100644
index 68f8581..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Index: openjdk/jdk/make/java/npt/Makefile
2===================================================================
3--- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200
4+++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200
5@@ -65,6 +65,8 @@
6 # We don't want to link against -ljava
7 JAVALIB=
8
9+LDLIBS += -liconv
10+
11 # Add -export options to explicitly spell exported symbols
12 ifeq ($(PLATFORM), windows)
13 OTHER_LCF += -export:nptInitialize -export:nptTerminate
14Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile
15===================================================================
16--- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200
17+++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200
18@@ -123,6 +123,8 @@
19 # We don't want to link against -ljava
20 JAVALIB=
21
22+LDLIBS += -liconv
23+
24 #
25 # Add to ambient vpath so we pick up the library files
26 #
27Index: openjdk/jdk/make/sun/splashscreen/Makefile
28===================================================================
29--- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200
30+++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200
31@@ -55,6 +55,8 @@
32
33 JAVALIB=
34
35+LDLIBS += -liconv
36+
37 #
38 # C Flags
39 #
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch
deleted file mode 100644
index 5423fde..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
2===================================================================
3--- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200
4+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200
5@@ -27,9 +27,6 @@
6 #include <X11/Xutil.h>
7 #include <X11/Xos.h>
8 #include <X11/Xatom.h>
9-#ifdef __linux__
10-#include <execinfo.h>
11-#endif
12
13 #include <jvm.h>
14 #include <jni.h>
15@@ -689,26 +686,6 @@
16 return ret;
17 }
18
19-#ifdef __linux__
20-void print_stack(void)
21-{
22- void *array[10];
23- size_t size;
24- char **strings;
25- size_t i;
26-
27- size = backtrace (array, 10);
28- strings = backtrace_symbols (array, size);
29-
30- fprintf (stderr, "Obtained %zd stack frames.\n", size);
31-
32- for (i = 0; i < size; i++)
33- fprintf (stderr, "%s\n", strings[i]);
34-
35- free (strings);
36-}
37-#endif
38-
39 Window get_xawt_root_shell(JNIEnv *env) {
40 static jclass classXRootWindow = NULL;
41 static jmethodID methodGetXRootWindow = NULL;
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch
deleted file mode 100644
index 40564f0..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: openjdk/jdk/make/com/sun/java/pack/Makefile
2===================================================================
3--- openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:21.548426411 +0200
4+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:43.858007543 +0200
5@@ -103,6 +103,7 @@
6 OTHER_LDLIBS += $(LIBCXX) -lc
7 # setup the list of libraries to link in...
8 ifeq ($(PLATFORM), linux)
9+ OTHER_LDLIBS += -lpthread
10 ifeq ("$(CC_VER_MAJOR)", "3")
11 OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
12 endif
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch
deleted file mode 100644
index ee24afa..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/launcher.make
2===================================================================
3--- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-16 17:30:56.000000000 +0100
4+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-16 17:31:13.000000000 +0100
5@@ -45,7 +45,7 @@
6 else
7 LAUNCHER.o = launcher.o
8 LFLAGS_LAUNCHER += -L `pwd`
9- LIBS_LAUNCHER += -l$(JVM) $(LIBS)
10+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
11 endif
12
13 LINK_LAUNCHER = $(LINK.c)
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch
deleted file mode 100644
index 024969d..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1Index: openjdk/jdk/make/java/net/Makefile
2===================================================================
3--- openjdk/jdk/make/java/net/Makefile 2010-07-05 12:28:58.476625401 +0200
4+++ openjdk/jdk/make/java/net/Makefile 2010-07-05 12:29:11.876625138 +0200
5@@ -25,7 +25,7 @@
6
7 BUILDDIR = ../..
8 PACKAGE = java.net
9-LIBRARY = net
10+LIBRARY = javanet
11 PRODUCT = sun
12 include $(BUILDDIR)/common/Defs.gmk
13
14Index: openjdk/jdk/make/java/nio/Makefile
15===================================================================
16--- openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:31:27.046626250 +0200
17+++ openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:32:06.647874890 +0200
18@@ -139,11 +139,11 @@
19 endif
20 ifeq ($(PLATFORM), linux)
21 COMPILER_WARNINGS_FATAL=true
22-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
23+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
24 endif
25 ifeq ($(PLATFORM), solaris)
26 OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
27- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
28+ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
29 endif # PLATFORM
30
31 #
32Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
33===================================================================
34--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200
35+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200
36@@ -58,7 +58,7 @@
37 */
38 static {
39 java.security.AccessController.doPrivileged(
40- new sun.security.action.LoadLibraryAction("net"));
41+ new sun.security.action.LoadLibraryAction("javanet"));
42 }
43
44 /**
45Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
46===================================================================
47--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200
48+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200
49@@ -74,7 +74,7 @@
50 */
51 static {
52 java.security.AccessController.doPrivileged(
53- new sun.security.action.LoadLibraryAction("net"));
54+ new sun.security.action.LoadLibraryAction("javanet"));
55 }
56
57 /**
58Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
59===================================================================
60--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200
61+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200
62@@ -47,7 +47,7 @@
63 */
64 static {
65 java.security.AccessController.doPrivileged(
66- new sun.security.action.LoadLibraryAction("net"));
67+ new sun.security.action.LoadLibraryAction("javanet"));
68 init();
69 }
70
71Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java
72===================================================================
73--- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200
74+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200
75@@ -230,7 +230,7 @@
76 static {
77 preferIPv6Address = java.security.AccessController.doPrivileged(
78 new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
79- AccessController.doPrivileged(new LoadLibraryAction("net"));
80+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
81 init();
82 }
83
84Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
85===================================================================
86--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200
87+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200
88@@ -52,7 +52,7 @@
89 private boolean virtual = false;
90
91 static {
92- AccessController.doPrivileged(new LoadLibraryAction("net"));
93+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
94 init();
95 }
96
97Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
98===================================================================
99--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200
100+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200
101@@ -89,7 +89,7 @@
102 }});
103 if (b != null && b.booleanValue()) {
104 java.security.AccessController.doPrivileged(
105- new sun.security.action.LoadLibraryAction("net"));
106+ new sun.security.action.LoadLibraryAction("javanet"));
107 hasSystemProxies = init();
108 }
109 }
110Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/share/classes/sun/nio/ch/Util.java
111===================================================================
112--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200
113+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200
114@@ -354,7 +354,7 @@
115 return;
116 loaded = true;
117 java.security.AccessController
118- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
119+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
120 java.security.AccessController
121 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
122 // IOUtil must be initialized; Its native methods are called from
123Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
124===================================================================
125--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200
126+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200
127@@ -244,7 +244,7 @@
128
129 static {
130 java.security.AccessController.doPrivileged(
131- new sun.security.action.LoadLibraryAction("net"));
132+ new sun.security.action.LoadLibraryAction("javanet"));
133 }
134
135 }
136Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
137===================================================================
138--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200
139+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200
140@@ -160,7 +160,7 @@
141
142 static {
143 java.security.AccessController.doPrivileged(
144- new sun.security.action.LoadLibraryAction("net"));
145+ new sun.security.action.LoadLibraryAction("javanet"));
146 init0();
147
148 // start the address listener thread
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch b/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch
deleted file mode 100644
index e47ee50..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Index: openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp
2===================================================================
3--- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 20:38:09.000000000 +0100
4+++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 21:03:15.781644337 +0100
5@@ -38,7 +38,11 @@
6 #include <llvm/ModuleProvider.h>
7 #endif
8 #include <llvm/Support/IRBuilder.h>
9+#if SHARK_LLVM_VERSION >= 29
10+#include <llvm/Support/Threading.h>
11+#else
12 #include <llvm/System/Threading.h>
13+#endif
14 #include <llvm/Target/TargetSelect.h>
15 #include <llvm/Type.h>
16 #include <llvm/ExecutionEngine/JITMemoryManager.h>
17@@ -47,8 +51,12 @@
18 #include <llvm/ExecutionEngine/JIT.h>
19 #include <llvm/ADT/StringMap.h>
20 #include <llvm/Support/Debug.h>
21+#if SHARK_LLVM_VERSION >= 29
22+#include <llvm/Support/Host.h>
23+#else
24 #include <llvm/System/Host.h>
25 #endif
26+#endif
27
28 #include <map>
29
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch
deleted file mode 100644
index f2ad035..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/gcc.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:35.758533706 +0100
4+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:42.761456458 +0100
5@@ -98,9 +98,6 @@
6 CFLAGS += -pipe
7 endif
8
9-# Compiler warnings are treated as errors
10-WARNINGS_ARE_ERRORS = -Werror
11-
12 # Except for a few acceptable ones
13 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
14 # conversions which might affect the values. To avoid that, we need to turn
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch
deleted file mode 100644
index 9f875de..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
2===================================================================
3--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100
4+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100
5@@ -27,13 +27,11 @@
6
7 #include "jfdlibm.h"
8
9-#ifdef __NEWVALID /* special setup for Sun test regime */
10 #if defined(i386) || defined(i486) || \
11 defined(intel) || defined(x86) || \
12 defined(i86pc) || defined(_M_IA64) || defined(ia64)
13 #define _LITTLE_ENDIAN
14 #endif
15-#endif
16
17 #ifdef _LITTLE_ENDIAN
18 #define __HI(x) *(1+(int*)&x)
diff --git a/recipes-core/openjdk/openjdk-6/jvm.cfg b/recipes-core/openjdk/openjdk-6/jvm.cfg
deleted file mode 100644
index 9e008e9..0000000
--- a/recipes-core/openjdk/openjdk-6/jvm.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
1# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
2# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3#
4# This code is free software; you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 2 only, as
6# published by the Free Software Foundation. Sun designates this
7# particular file as subject to the "Classpath" exception as provided
8# by Sun in the LICENSE file that accompanied this code.
9#
10# This code is distributed in the hope that it will be useful, but WITHOUT
11# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13# version 2 for more details (a copy is included in the LICENSE file that
14# accompanied this code).
15#
16# You should have received a copy of the GNU General Public License version
17# 2 along with this work; if not, write to the Free Software Foundation,
18# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19#
20# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
21# CA 95054 USA or visit www.sun.com if you need additional information or
22# have any questions.
23#
24#
25# List of JVMs that can be used as an option to java, javac, etc.
26# Order is important -- first in this list is the default JVM.
27# NOTE that this both this file and its format are UNSUPPORTED and
28# WILL GO AWAY in a future release.
29#
30# You may also select a JVM in an arbitrary location with the
31# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
32# and may not be available in a future release.
33#
34-server ERROR
35-client IGNORE
36-hotspot ERROR
37-classic WARN
38-native ERROR
39-green ERROR
40-zero ALIASED_TO -server
41-cacao ERROR
diff --git a/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch b/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch
deleted file mode 100644
index 13280b3..0000000
--- a/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1Index: icedtea6/ports/hotspot/tools/mkbc.c
2===================================================================
3--- icedtea6.orig/ports/hotspot/tools/mkbc.c 2010-04-01 12:25:13.791317722 +0200
4+++ icedtea6/ports/hotspot/tools/mkbc.c 2010-04-01 12:27:34.151606177 +0200
5@@ -602,4 +602,6 @@
6 if (ferror(bci_f)) fatal("Error writing bci");
7 if (source_f != stdin) fclose(source_f);
8 if (bci_f != stdout) fclose(bci_f);
9+
10+ return 0;
11 }
diff --git a/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch
deleted file mode 100644
index df9e147..0000000
--- a/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch
+++ /dev/null
@@ -1,113 +0,0 @@
1Index: icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
2===================================================================
3--- icedtea6-1.8.orig/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200
4+++ icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:50:51.680282178 +0200
5@@ -32,6 +32,96 @@
6
7 #if SHARK_LLVM_VERSION >= 27
8 namespace {
9+
10+#if defined(__arm__) && defined(__linux__)
11+#include <fcntl.h>
12+#include <linux/auxvec.h>
13+#include <asm/hwcap.h>
14+#define VECBUFF_SIZE 32
15+
16+bool TestARMLinuxHWCAP(int feature) {
17+ int fd;
18+ unsigned vecs[VECBUFF_SIZE];
19+ unsigned *p;
20+ int i, n;
21+ int rc;
22+
23+ rc = 0;
24+ fd = open("/proc/self/auxv", O_RDONLY);
25+ if (fd < 0) return 0;
26+ do {
27+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
28+ p = vecs;
29+ i = n/8;
30+ while (--i >=0) {
31+ unsigned tag = *p++;
32+ unsigned value = *p++;
33+ if (tag == 0) goto fini;
34+ if(tag == AT_HWCAP && (value & feature)) {
35+ rc = 1;
36+ goto fini;
37+ }
38+ }
39+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
40+fini:
41+ close(fd);
42+ return rc;
43+}
44+
45+char* TestARMLinuxAT(int auxvec) {
46+ int fd;
47+ unsigned vecs[VECBUFF_SIZE];
48+ unsigned *p;
49+ int i, n;
50+ char* rc;
51+
52+ rc = 0;
53+ fd = open("/proc/self/auxv", O_RDONLY);
54+ if (fd < 0) return 0;
55+ do {
56+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned));
57+ p = vecs;
58+ i = n/8;
59+ while (--i >=0) {
60+ unsigned tag = *p++;
61+ unsigned value = *p++;
62+ if (tag == 0) goto fini;
63+ if(tag == (unsigned) auxvec ) {
64+ rc = (char*)value;
65+ goto fini;
66+ }
67+ }
68+ } while (n == VECBUFF_SIZE * sizeof(unsigned));
69+fini:
70+ close(fd);
71+ return rc;
72+}
73+
74+bool getARMHostCPUFeatures(StringMap<bool> &Features) {
75+ // FIXME LLVM PR6561 // Features["neon"]=TestARMLinuxHWCAP(HWCAP_NEON);
76+ Features["thumb2"]=TestARMLinuxHWCAP(HWCAP_THUMBEE);
77+ Features["vfp2"]=TestARMLinuxHWCAP(HWCAP_VFP);
78+
79+ std::string testArchKey(TestARMLinuxAT(AT_PLATFORM));
80+
81+ StringMap<std::string> archLinuxToLLVMMap;
82+ archLinuxToLLVMMap["v4l"]="v4t";
83+ archLinuxToLLVMMap["v5l"]="v5t";
84+ archLinuxToLLVMMap["v6l"]="v6";
85+ // FIXME change this from v6 to v7a when LLVM PR7048 have been fixed
86+ archLinuxToLLVMMap["v7l"]="v6";
87+
88+ llvm::StringMapIterator<std::string> resultIterator(archLinuxToLLVMMap.find(
89+ testArchKey));
90+ if(resultIterator->first()) {
91+ std::string arch(resultIterator->second);
92+ Features[arch]=true;
93+ }
94+
95+ return true;
96+}
97+#endif
98+
99 cl::opt<std::string>
100 MCPU("mcpu");
101
102@@ -64,7 +154,11 @@
103 #if SHARK_LLVM_VERSION >= 27
104 // Finetune LLVM for the current host CPU.
105 StringMap<bool> Features;
106+#if defined(__arm__) && defined(__linux__)
107+ bool gotCpuFeatures = getARMHostCPUFeatures(Features);
108+#else
109 bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features);
110+#endif
111 std::string cpu("-mcpu=" + llvm::sys::getHostCPUName());
112
113 std::vector<const char*> args;
diff --git a/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch b/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch
deleted file mode 100644
index 4e89967..0000000
--- a/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea6-1.8/Makefile.am
2===================================================================
3--- icedtea6-1.8.orig/Makefile.am 2010-06-30 11:30:49.526648376 +0200
4+++ icedtea6-1.8/Makefile.am 2010-06-30 11:42:02.606648734 +0200
5@@ -1882,7 +1882,7 @@
6 # configure script arguments, quoted in single quotes
7 CONFIGURE_ARGS = @CONFIGURE_ARGS@
8 ADD_ZERO_CONFIGURE_ARGS = \
9- --with-openjdk=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
10+ --with-openjdk=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
11 --enable-zero
12 if ADD_SHARK_BUILD
13 ADD_ZERO_CONFIGURE_ARGS += \
diff --git a/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch b/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch
deleted file mode 100644
index ca21ccf..0000000
--- a/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Index: icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
2===================================================================
3--- icedtea6-1.8.orig/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:26:16.885292426 +0200
4+++ icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:29:19.034668305 +0200
5@@ -266,7 +266,15 @@
6 volatile jlong* dest,
7 jlong compare_value) {
8
9+#ifdef ARM
10+ return arm_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value);
11+#else
12+#ifdef M68K
13+ return m68k_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value);
14+#else
15 return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
16+#endif // M68K
17+#endif // ARM
18 }
19
20 inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
diff --git a/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb b/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb
deleted file mode 100644
index 3daffba..0000000
--- a/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require openjdk-6-release-6b24.inc
2
3PR = "${INC_PR}.1"
4
5SRC_URI[iced.md5sum] = "1826c4bfb4faae1e820dd8997428a831"
6SRC_URI[iced.sha256sum] = "0c134bea8d48c77ad5d41d4a0f98f471c381faaa0ef0c215d48687e709e93f3f"
7
8ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no"
9
10DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch"
diff --git a/recipes-core/openjdk/openjdk-6_6b24_hg.bb b/recipes-core/openjdk/openjdk-6_6b24_hg.bb
deleted file mode 100644
index fcc9c05..0000000
--- a/recipes-core/openjdk/openjdk-6_6b24_hg.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require openjdk-6-release-6b24.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4
5PR = "${INC_PR}.0"
6
7ICEDTEA = "icedtea6"
8
9SRCREV = "54ceda20a02c"
10PV = "6b24-1.11.1+1.11.2-devel+hg${SRCPV}"
11
12ICEDTEA_URI = "hg://icedtea.classpath.org/hg/;module=icedtea6;rev=${SRCREV}"
diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb
deleted file mode 100644
index 8d12a8e..0000000
--- a/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require openjdk-6-release-6b27.inc
2
3PR = "${INC_PR}.4"
4
5SRC_URI[iced.md5sum] = "7712c4b3b9f8092aa8c7b5cad0b46d06"
6SRC_URI[iced.sha256sum] = "c2ad74af29af774f778675d3fde952f4defebb2be44f565253d788e2e7af39d4"
diff --git a/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb b/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb
deleted file mode 100644
index 69a3e1e..0000000
--- a/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require openjdk-6-release-6b32.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[iced.md5sum] = "95d61221d0be3616c8c04d164df524a4"
6SRC_URI[iced.sha256sum] = "302b17575ad98bbf6a1d4d8768d2ea1f1b070f153c660ebe493b6509d56ed0e7"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-07 11:36:28 +0000