aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2013-09-29 13:34:09 +0000
committerHenning Heinold <heinold@inf.fu-berlin.de>2013-09-29 21:53:27 +0200
commitf03d3e5bbb6a096960a781547884015f50be96da (patch)
tree24cda7f1740cfbafbbb3073e85aedee4cfc3eba0
parent7fce07f9fbdada8ba9c3d1bc65d5bcd9c7a8d1d8 (diff)
downloadmeta-java-f03d3e5bbb6a096960a781547884015f50be96da.tar.gz
meta-java-f03d3e5bbb6a096960a781547884015f50be96da.tar.bz2
meta-java-f03d3e5bbb6a096960a781547884015f50be96da.zip
openjdk7: update openjdk7 to version 2.3.12
* notice openjdk7 2.1 and 2.2 will soon get no updates anymore * openjdk7 2.3 has now arm byte compiler support * use cacao hg version e215e36be9fc, because a567bcb7f589 is not working
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new62
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-hostbuildcc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isnanf.patch21
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-libnet-renaming.patch154
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_sparc_compiler_option.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_werror.patch14
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/jamvm-extract.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/build-hacks.patch)48
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/cacao-libtoolize.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch63
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/fix_hotspot_crosscompile.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-corba-parallel-make.patch)4
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch)290
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-fix-xrender.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-dlvsym-uclibc.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isfinte.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-loadavg.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-nio-use-host-cc.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-ppc64-jvm-cfg.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-remove-unused-backtrace.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-unpack-uclibc.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-launcher-stdc++.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch188
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch16
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-shark-arm-linux-cpu-detection.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-unbreak-float.patch)6
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch)17
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/jvm.cfg (renamed from recipes-core/openjdk/openjdk-7-03b21/jvm.cfg)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch47
-rw-r--r--recipes-core/openjdk/openjdk-7-release-25b30.inc (renamed from recipes-core/openjdk/openjdk-7-release-03b21.inc)43
-rw-r--r--recipes-core/openjdk/openjdk-7_03b21-2.1.8.bb36
-rw-r--r--recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb36
41 files changed, 572 insertions, 550 deletions
diff --git a/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch b/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch
deleted file mode 100644
index 5987ccf..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: icedtea-2.1.8/Makefile.am
-===================================================================
---- icedtea-2.1.8.orig/Makefile.am 2013-05-03 15:58:48.434381989 +0200
-+++ icedtea-2.1.8/Makefile.am 2013-05-03 15:59:28.495766246 +0200
-@@ -18,7 +18,7 @@
- JAXWS_SHA256SUM = 1ca9cb115591eb20143cf0d88a57f07fb631ea41246d05017e30a6ae3766517d
- JDK_SHA256SUM = bbfa99c5d9900d16a9359fbdfd1cca9cbfd49095a823eb06ca56d75bca0a8eaf
- LANGTOOLS_SHA256SUM = 46d93bd9069d86ea233464d5a9777b12f0a027142b9ac665e3b244f69a5416b6
--OPENJDK_SHA256SUM = 6cb4258bf22daba0dd5b8cbfee8acd8a378b3e1f36259b6437f7589c74ed6e4f
-+OPENJDK_SHA256SUM = 19018c45d97cecd9c753a6fc4b52af57cc93b65e3ee303c0750a7961171d5f3d
-
- CACAO_VERSION = a567bcb7f589
- CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new b/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new
deleted file mode 100644
index c14d378..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/jdk/make/sun/awt/mawt.gmk b/jdk/make/sun/awt/mawt.gmk
-index 45e8349..ed452ba 100644
---- a/jdk/make/sun/awt/mawt.gmk
-+++ b/jdk/make/sun/awt/mawt.gmk
-@@ -151,22 +151,6 @@ else
- #endif
-
- LIBXTST = -lXtst
--ifeq ($(PLATFORM), linux)
-- ifeq ($(ARCH_DATA_MODEL), 64)
-- # XXX what about the rest of them?
-- LIBXT = -lXt
-- else
-- # Allows for builds on Debian GNU Linux, X11 is in a different place
-- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
-- $(wildcard /usr/lib/libXt.a))
-- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
-- $(wildcard /usr/lib/libSM.a))
-- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
-- $(wildcard /usr/lib/libICE.a))
-- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
-- $(wildcard /usr/lib/libXtst.a))
-- endif
--endif
-
- # Use -lXmu for EditRes support
- LIBXMU_DBG = -lXmu
-@@ -181,7 +165,7 @@ ifeq ($(PLATFORM), linux)
- OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
- # XXX what is this define below? Isn't it motif-related?
- OTHER_CFLAGS += -DXMSTRINGDEFINES=1
--OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
-+OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lXi -lX11
- endif
-
- endif
-@@ -230,12 +214,6 @@ else
- CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
- endif
-
--ifndef HEADLESS
--CPPFLAGS += -I$(OPENWIN_HOME)/include
--LDFLAGS += -L$(OPENWIN_LIB)
--
--endif # !HEADLESS
--
- CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-@@ -258,12 +236,6 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- $(EVENT_MODEL)
-
--ifeq ($(PLATFORM), linux)
-- # Checking for the X11/extensions headers at the additional location
-- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
-- $(wildcard /usr/include/X11/extensions))
--endif
--
- ifeq ($(PLATFORM), solaris)
- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
- endif
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-hostbuildcc.patch
deleted file mode 100644
index 5f2c98b..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hostbuildcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: openjdk/hotspot/make/linux/makefiles/rules.make
-===================================================================
---- openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:22:33.201668748 +0100
-+++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:23:08.480415783 +0100
-@@ -39,6 +39,7 @@
- # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
- C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
- CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
-+CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS)
-
- AS.S = $(AS) $(ASFLAGS)
-
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isnanf.patch
deleted file mode 100644
index 494e965..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isnanf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
-===================================================================
---- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:47:12.695674808 +0200
-+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:48:08.699007491 +0200
-@@ -220,14 +220,14 @@
- // checking for nanness
- #ifdef SOLARIS
- #ifdef SPARC
--inline int g_isnan(float f) { return isnanf(f); }
-+inline int g_isnan(float f) { return __isnanf(f); }
- #else
- // isnanf() broken on Intel Solaris use isnand()
- inline int g_isnan(float f) { return isnand(f); }
- #endif
- inline int g_isnan(double f) { return isnand(f); }
- #elif LINUX
--inline int g_isnan(float f) { return isnanf(f); }
-+inline int g_isnan(float f) { return __isnanf(f); }
- inline int g_isnan(double f) { return isnan(f); }
- #else
- #error "missing platform-specific definition here"
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-libnet-renaming.patch
deleted file mode 100644
index f590577..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-libnet-renaming.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Index: openjdk/jdk/make/java/net/Makefile
-===================================================================
---- openjdk/jdk/make/java/net/Makefile 2010-07-05 12:28:58.476625401 +0200
-+++ openjdk/jdk/make/java/net/Makefile 2010-07-05 12:29:11.876625138 +0200
-@@ -25,7 +25,7 @@
-
- BUILDDIR = ../..
- PACKAGE = java.net
--LIBRARY = net
-+LIBRARY = javanet
- PRODUCT = sun
- include $(BUILDDIR)/common/Defs.gmk
-
-Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
-===================================================================
---- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200
-+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200
-@@ -58,7 +58,7 @@
- */
- static {
- java.security.AccessController.doPrivileged(
-- new sun.security.action.LoadLibraryAction("net"));
-+ new sun.security.action.LoadLibraryAction("javanet"));
- }
-
- /**
-Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
-===================================================================
---- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200
-+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200
-@@ -74,7 +74,7 @@
- */
- static {
- java.security.AccessController.doPrivileged(
-- new sun.security.action.LoadLibraryAction("net"));
-+ new sun.security.action.LoadLibraryAction("javanet"));
- }
-
- /**
-Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
-===================================================================
---- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200
-+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200
-@@ -47,7 +47,7 @@
- */
- static {
- java.security.AccessController.doPrivileged(
-- new sun.security.action.LoadLibraryAction("net"));
-+ new sun.security.action.LoadLibraryAction("javanet"));
- init();
- }
-
-Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java
-===================================================================
---- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200
-+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200
-@@ -230,7 +230,7 @@
- static {
- preferIPv6Address = java.security.AccessController.doPrivileged(
- new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
-- AccessController.doPrivileged(new LoadLibraryAction("net"));
-+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
- init();
- }
-
-Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
-===================================================================
---- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200
-+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200
-@@ -52,7 +52,7 @@
- private boolean virtual = false;
-
- static {
-- AccessController.doPrivileged(new LoadLibraryAction("net"));
-+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
- init();
- }
-
-Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
-===================================================================
---- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200
-+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200
-@@ -89,7 +89,7 @@
- }});
- if (b != null && b.booleanValue()) {
- java.security.AccessController.doPrivileged(
-- new sun.security.action.LoadLibraryAction("net"));
-+ new sun.security.action.LoadLibraryAction("javanet"));
- hasSystemProxies = init();
- }
- }
-Index: 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
-===================================================================
---- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200
-@@ -354,7 +354,7 @@
- return;
- loaded = true;
- java.security.AccessController
-- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
-+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
- java.security.AccessController
- .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
- // IOUtil must be initialized; Its native methods are called from
-Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
-===================================================================
---- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200
-@@ -244,7 +244,7 @@
-
- static {
- java.security.AccessController.doPrivileged(
-- new sun.security.action.LoadLibraryAction("net"));
-+ new sun.security.action.LoadLibraryAction("javanet"));
- }
-
- }
-Index: 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
-===================================================================
---- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200
-+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200
-@@ -160,7 +160,7 @@
-
- static {
- java.security.AccessController.doPrivileged(
-- new sun.security.action.LoadLibraryAction("net"));
-+ new sun.security.action.LoadLibraryAction("javanet"));
- init0();
-
- // start the address listener thread
---- openjdk/jdk/make/java/nio/Makefile
-+++ openjdk/jdk/make/java/nio/Makefile
-@@ -282,7 +282,7 @@ ifeq ($(PLATFORM),windows)
- endif
-
- ifeq ($(PLATFORM), linux)
--OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
-+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
- ifdef USE_SYSTEM_GIO
- OTHER_LDLIBS += $(GIO_LIBS)
- OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
-diff --git openjdk/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
-index e71a92b..e94b1e1 100644
---- openjdk/jdk/make/com/sun/nio/sctp/Makefile
-+++ openjdk/jdk/make/com/sun/nio/sctp/Makefile
-@@ -62,7 +62,7 @@ OTHER_INCLUDES += \
- ifeq ($(PLATFORM), linux)
- COMPILER_WARNINGS_FATAL=true
- #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
--OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
-+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
- endif
- ifeq ($(PLATFORM), solaris)
- #LIBSCTP = -lsctp
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_sparc_compiler_option.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_sparc_compiler_option.patch
deleted file mode 100644
index be5ad85..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_sparc_compiler_option.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openjdk/jdk/make/common/shared/Compiler-gcc.gmk
-===================================================================
---- openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-05-26 14:43:49.342875981 +0200
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-05-26 15:21:25.514903711 +0200
-@@ -133,7 +133,7 @@
- REQUIRED_GCC_VER = 4.0.*
- endif
- # Option used to create a shared library
-- SHARED_LIBRARY_FLAG = -shared -mimpure-text
-+ SHARED_LIBRARY_FLAG = -shared
- SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
-
- endif
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_werror.patch
deleted file mode 100644
index f2ad035..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_werror.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: openjdk/hotspot/make/linux/makefiles/gcc.make
-===================================================================
---- openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:35.758533706 +0100
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:42.761456458 +0100
-@@ -98,9 +98,6 @@
- CFLAGS += -pipe
- endif
-
--# Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
--
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
- # conversions which might affect the values. To avoid that, we need to turn
diff --git a/recipes-core/openjdk/openjdk-7-03b21/jamvm-extract.patch b/recipes-core/openjdk/openjdk-7-03b21/jamvm-extract.patch
deleted file mode 100644
index 9040304..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/jamvm-extract.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: icedtea-2.1/Makefile.am
-===================================================================
---- icedtea-2.1.orig/Makefile.am
-+++ icedtea-2.1/Makefile.am
-@@ -1210,7 +1210,7 @@ endif
- clean-extract-cacao: clean-cacao
- rm -f stamps/extract-cacao.stamp
-
--stamps/extract-jamvm.stamp:
-+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
- if BUILD_JAMVM
- set -e ; \
- if ! test -d jamvm ; \
diff --git a/recipes-core/openjdk/openjdk-7-03b21/build-hacks.patch b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
index d6776ae..5eccc68 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/build-hacks.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
@@ -1,8 +1,8 @@
-Index: icedtea-2.1/Makefile.am
+Index: icedtea-2.3.12/Makefile.am
===================================================================
---- icedtea-2.1.orig/Makefile.am
-+++ icedtea-2.1/Makefile.am
-@@ -416,6 +416,12 @@ ICEDTEA_ENV = \
+--- icedtea-2.3.12.orig/Makefile.am 2013-07-26 18:17:45.499466367 +0000
++++ icedtea-2.3.12/Makefile.am 2013-07-30 21:04:46.761410713 +0000
+@@ -471,6 +471,12 @@
JAVAC="" \
JAVA_HOME="" \
JDK_HOME="" \
@@ -15,38 +15,20 @@ Index: icedtea-2.1/Makefile.am
QUIETLY="" \
ANT_RESPECT_JAVA_HOME="TRUE" \
DISTRIBUTION_ID="$(DIST_ID)" \
-@@ -1923,12 +1929,16 @@ clean-rewrite-rhino:
- stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
+@@ -2028,7 +2034,11 @@
if BUILD_JAMVM
cd jamvm/jamvm && \
-- ./autogen.sh --with-java-runtime-library=openjdk \
+ ./autogen.sh --with-java-runtime-library=openjdk7 \
- --prefix=$(abs_top_builddir)/jamvm/install ; \
-- $(MAKE) ; \
-- $(MAKE) install
-+ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk \
-+ --prefix=/usr/lib \
++ --prefix=$(abs_top_builddir)/jamvm/install \
+ --host=$(host_alias) \
+ --build=$(build_alias) \
+ --target=$(target_alias) \
+ --with-libtool-sysroot ; \
-+ $(ARCH_PREFIX) $(MAKE) ; \
-+ $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install
+ $(MAKE) ; \
+ $(MAKE) install
mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
-- cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
-+ cp $(abs_top_builddir)/jamvm/install/usr/lib/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
- ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
- touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
- ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
-@@ -1945,7 +1955,7 @@ clean-jamvm:
- stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp
- if ADD_JAMVM_BUILD
- mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm
-- install -m 644 jamvm/install/lib/libjvm.so \
-+ install -m 644 jamvm/install/usr/lib/lib/libjvm.so \
- $(BUILD_JRE_ARCH_DIR)/jamvm/
- printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
- else
-@@ -1989,6 +1999,7 @@ if !USE_SYSTEM_CACAO
+@@ -2093,6 +2103,7 @@
--host=$(host_alias) \
--build=$(build_alias) \
--target=$(target_alias) \
@@ -54,7 +36,7 @@ Index: icedtea-2.1/Makefile.am
--prefix=$(abs_top_builddir)/cacao/install \
--with-java-runtime-library=openjdk7 \
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
-@@ -2056,7 +2067,7 @@ clean-add-cacao-debug:
+@@ -2160,7 +2171,7 @@
# configure script arguments, quoted in single quotes
CONFIGURE_ARGS = @CONFIGURE_ARGS@
ADD_ZERO_CONFIGURE_ARGS = \
@@ -63,11 +45,11 @@ Index: icedtea-2.1/Makefile.am
--disable-bootstrap --enable-zero
if ADD_SHARK_BUILD
ADD_ZERO_CONFIGURE_ARGS += \
-Index: icedtea-2.1/javac.in
+Index: icedtea-2.3.12/javac.in
===================================================================
---- icedtea-2.1.orig/javac.in
-+++ icedtea-2.1/javac.in
-@@ -70,5 +70,7 @@ else
+--- icedtea-2.3.12.orig/javac.in 2013-07-24 21:33:57.224612327 +0000
++++ icedtea-2.3.12/javac.in 2013-07-30 19:41:56.240277496 +0000
+@@ -77,5 +77,7 @@
my @CLASSPATH = ('@ECJ_JAR@');
push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch
index c21fcf1..c21fcf1 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch
index 484cb10..484cb10 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-libtoolize.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch
index 81ac590..81ac590 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch
index 0fc1a81..0fc1a81 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch
diff --git a/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch
new file mode 100644
index 0000000..cd6cdbf
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch
@@ -0,0 +1,63 @@
+
+# HG changeset patch
+# User Andrew John Hughes <gnu_andrew@member.fsf.org>
+# Date 1366807128 -3600
+# Node ID e562523c5037d8c6097afa00cc2932a959037a61
+# Parent d4e0f297cf8fb7a4e457d5bef8f0290623cf8b05
+Update CACAO to latest tip.
+
+2013-04-24 Andrew John Hughes <gnu.andrew@member.fsf.org>
+
+ * patches/cacao/jsig.patch:
+ Removed.
+ * Makefile.am:
+ (CACAO_VERSION): Bump to current tip.
+ (CACAO_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Drop unneeded jsig patch.
+ * NEWS: Updated.
+
+diff -r d4e0f297cf8f -r e562523c5037 Makefile.am
+--- a/Makefile.am Wed Apr 24 10:24:40 2013 +0100
++++ b/Makefile.am Wed Apr 24 13:38:48 2013 +0100
+@@ -18,8 +18,8 @@
+ LANGTOOLS_SHA256SUM = c412b61b095154fee4c45dc133f2baca3100fecd48b742f80da49a52ec473b02
+ OPENJDK_SHA256SUM = 44c3e4a130fe4b76c1ba977ae2251884cefa774b82a24c4415b64395aef9594c
+
+-CACAO_VERSION = a567bcb7f589
+-CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
++CACAO_VERSION = e215e36be9fc
++CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
+ CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
+ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
+ CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
+@@ -266,7 +266,6 @@
+ if BUILD_CACAO
+ ICEDTEA_PATCHES += \
+ patches/cacao/launcher.patch \
+- patches/cacao/jsig.patch \
+ patches/cacao/memory.patch
+ else
+ if USING_CACAO
+diff -r d4e0f297cf8f -r e562523c5037 patches/cacao/jsig.patch
+--- a/patches/cacao/jsig.patch Wed Apr 24 10:24:40 2013 +0100
++++ /dev/null Thu Jan 01 00:00:00 1970 +0000
+@@ -1,18 +0,0 @@
+-diff -Nru cacao.orig/Makefile.am cacao/Makefile.am
+---- cacao.orig/cacao/src/cacao/Makefile.am 2008-08-04 17:51:28.000000000 +0100
+-+++ cacao/cacao/src/cacao/Makefile.am 2010-05-11 10:29:35.000000000 +0100
+-@@ -96,12 +96,12 @@
+- $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
+- $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
+- $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+-- $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
+-+ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
+-
+- uninstall-local:
+- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
+- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+-- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
+-+ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
+- endif
+-
+-
+
diff --git a/recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch b/recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch
new file mode 100644
index 0000000..bb05b3b
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch
@@ -0,0 +1,13 @@
+Index: icedtea-2.3.12/Makefile.am
+===================================================================
+--- icedtea-2.3.12.orig/Makefile.am 2013-07-29 13:18:15.437439600 +0000
++++ icedtea-2.3.12/Makefile.am 2013-07-29 13:18:40.921456562 +0000
+@@ -16,7 +16,7 @@
+ JAXWS_SHA256SUM = b149c1fab323a586eae9b4459ccd929f0db8b35769e42dd7f4fbadc48b803dab
+ JDK_SHA256SUM = badbbf50c820325ffe592762a2eff3414df71e286460b75716a2100d7f6f2aa0
+ LANGTOOLS_SHA256SUM = b9e2e3c97393f566b0c4dc2b0ca826bfb3b3841f5522a850b82d1ff23745839b
+-OPENJDK_SHA256SUM = 7bc64e2285b5bfefeb6a3900729c58beb2f04f2c57184a4fe48341c5087c3f61
++OPENJDK_SHA256SUM = d1132bdde0e19d8e4d2516213bce7aa50b4b6d1ab04a82bf7a0440d6184db842
+
+ CACAO_VERSION = a567bcb7f589
+ CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff --git a/recipes-core/openjdk/openjdk-7-03b21/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch
index 8d2d045..8d2d045 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/fix_hotspot_crosscompile.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-corba-parallel-make.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch
index 09f7511..3e2893c 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-corba-parallel-make.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch
@@ -1,5 +1,5 @@
diff --git openjdk/corba/make/Makefile openjdk/corba/make/Makefile
-index aef5c1b..62e2216 100644
+index d81c66c..4f750e8 100644
--- openjdk/corba/make/Makefile
+++ openjdk/corba/make/Makefile
@@ -134,7 +134,7 @@ default: all
@@ -20,7 +20,7 @@ index aef5c1b..62e2216 100644
( cd $(SRC_CLASSES_DIR) ; $(FIND) . \( -name \*-template \) -prune -o -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; \
( cd $(GENSRC_DIR) ; $(FIND) . -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ;
@@ -153,7 +154,8 @@ $(SRC_ZIP): $(SRC_ZIP_FILES)
- BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
+ BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
BIN_ZIP = $(LIB_DIR)/bin.zip
-$(BIN_ZIP): $(BIN_ZIP_FILES)
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch
index 9099d4c..39436a5 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch
@@ -1,17 +1,50 @@
---- openjdk/hotspot/make/linux/makefiles/buildtree.make
-+++ openjdk/hotspot/make/linux/makefiles/buildtree.make
-@@ -402,7 +402,7 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
- echo "rm -f Queens.class"; \
- echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
- echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
-- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
-+ echo 'echo Silently skipping the execution of the gamma program'; \
- ) > $@
- $(QUIETLY) chmod +x $@
+diff --git openjdk/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
+index fb575fa..e0426ad 100644
+--- openjdk/corba/make/common/shared/Platform.gmk
++++ openjdk/corba/make/common/shared/Platform.gmk
+@@ -152,9 +152,13 @@ ifeq ($(SYSTEM_UNAME), Linux)
+ OS_NAME = linux
+ OS_VERSION := $(shell uname -r)
+ # Arch and OS name/version
+- mach := $(shell uname -m)
+- ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
++ ifdef CROSS_COMPILE_ARCH
++ mach := $(CROSS_COMPILE_ARCH)
++ else
++ mach := $(shell uname -m)
++ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
++ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
++ endif
+ endif
+ archExpr = case "$(mach)" in \
+ i[3-9]86) \
+diff --git openjdk/hotspot/make/linux/makefiles/build_vm_def.sh openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
+index ea81ff6..68b0d71 100644
+--- openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
++++ openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
+@@ -1,10 +1,12 @@
+ #!/bin/sh
+ # If we're cross compiling use that path for nm
+-if [ "$CROSS_COMPILE_ARCH" != "" ]; then
+-NM=$ALT_COMPILER_PATH/nm
+-else
+-NM=nm
++if [ "$NM" == "" ]; then
++ if [ "$CROSS_COMPILE_ARCH" != "" ]; then
++ NM=$ALT_COMPILER_PATH/nm
++ else
++ NM=nm
++ fi
+ fi
+
+ $NM --defined-only $* \
+diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+index 6fe5191..765fc6d 100644
--- openjdk/hotspot/make/linux/makefiles/gcc.make
+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -160,7 +160,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+@@ -164,7 +164,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
# The flags to use for an Optimized g++ build
@@ -20,7 +53,7 @@
# Hotspot uses very unstrict aliasing turn this optimization off
OPT_CFLAGS += -fno-strict-aliasing
-@@ -204,15 +204,7 @@ LFLAGS += -Wl,-relax
+@@ -208,15 +208,7 @@ LFLAGS += -Wl,-relax
endif
# Enable linker optimization
@@ -37,6 +70,8 @@
# Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
MAPFLAG = -Xlinker --version-script=FILENAME
+diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make
+index 0c102ea..f4dfbf6 100644
--- openjdk/hotspot/make/linux/makefiles/launcher.make
+++ openjdk/hotspot/make/linux/makefiles/launcher.make
@@ -50,8 +50,8 @@ ifeq ($(LINK_INTO),AOUT)
@@ -49,21 +84,25 @@
+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
endif
- LINK_LAUNCHER = $(LINK.c)
+ LINK_LAUNCHER = $(LINK.CC)
+diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
+index b0ffd9a..4e8c47c 100644
--- openjdk/hotspot/make/linux/makefiles/vm.make
+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -272,6 +272,7 @@ ifeq ($(SHARK_BUILD), true)
+@@ -292,6 +292,7 @@ ifeq ($(SHARK_BUILD), true)
LIBS_VM += $(LLVM_LIBS)
endif
+LFLAGS_VM += $(OE_LDFLAGS)
- LINK_VM = $(LINK_LIB.c)
+ LINK_VM = $(LINK_LIB.CC)
# rule for building precompiled header
+diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
+index 69e1177..dc7f8e6 100644
--- openjdk/jdk/make/common/Defs-linux.gmk
+++ openjdk/jdk/make/common/Defs-linux.gmk
-@@ -125,35 +125,13 @@ else
- endif
+@@ -165,35 +165,13 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ endif
endif
-#
@@ -99,8 +138,8 @@
CFLAGS_REQUIRED_hppa +=
CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-@@ -232,7 +210,7 @@ ifeq ($(DEBUG_BINARIES), true)
- CFLAGS_REQUIRED += $(DEBUG_FLAG)
+@@ -283,7 +261,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ endif
endif
-CFLAGS_OPT = $(CC_OPT)
@@ -108,7 +147,7 @@
CFLAGS_DBG = $(DEBUG_FLAG)
CFLAGS_COMMON += $(CFLAGS_REQUIRED)
-@@ -308,7 +286,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
+@@ -359,7 +337,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
#
# -L paths for finding and -ljava
#
@@ -117,89 +156,8 @@
LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
---- openjdk/jdk/make/sun/awt/mawt.gmk
-+++ openjdk/jdk/make/sun/awt/mawt.gmk
-@@ -151,22 +151,6 @@ else
- #endif
-
- LIBXTST = -lXtst
--ifeq ($(PLATFORM), linux)
-- ifeq ($(ARCH_DATA_MODEL), 64)
-- # XXX what about the rest of them?
-- LIBXT = -lXt
-- else
-- # Allows for builds on Debian GNU Linux, X11 is in a different place
-- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
-- $(wildcard /usr/lib/libXt.a))
-- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
-- $(wildcard /usr/lib/libSM.a))
-- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
-- $(wildcard /usr/lib/libICE.a))
-- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
-- $(wildcard /usr/lib/libXtst.a))
-- endif
--endif
-
- # Use -lXmu for EditRes support
- LIBXMU_DBG = -lXmu
-@@ -181,7 +165,7 @@ ifeq ($(PLATFORM), linux)
- OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
- # XXX what is this define below? Isn't it motif-related?
- OTHER_CFLAGS += -DXMSTRINGDEFINES=1
--OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
-+OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lXi -lX11
- endif
-
- endif
-@@ -230,12 +214,6 @@ else
- CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
- endif
-
--ifndef HEADLESS
--CPPFLAGS += -I$(OPENWIN_HOME)/include
--LDFLAGS += -L$(OPENWIN_LIB)
--
--endif # !HEADLESS
--
- CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-@@ -258,12 +236,6 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
- -I$(PLATFORM_SRC)/native/$(PKGDIR) \
- $(EVENT_MODEL)
-
--ifeq ($(PLATFORM), linux)
-- # Checking for the X11/extensions headers at the additional location
-- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
-- $(wildcard /usr/include/X11/extensions))
--endif
--
- ifeq ($(PLATFORM), solaris)
- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
- endif
-diff --git openjdk/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
-index e21f4d0..5f071a7 100644
---- openjdk/corba/make/common/shared/Platform.gmk
-+++ openjdk/corba/make/common/shared/Platform.gmk
-@@ -152,9 +152,13 @@ ifeq ($(SYSTEM_UNAME), Linux)
- OS_NAME = linux
- OS_VERSION := $(shell uname -r)
- # Arch and OS name/version
-- mach := $(shell uname -m)
-- ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
-+ ifdef CROSS_COMPILE_ARCH
-+ mach := $(CROSS_COMPILE_ARCH)
-+ else
-+ mach := $(shell uname -m)
-+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-+ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
-+ endif
- endif
- archExpr = case "$(mach)" in \
- i[3-9]86) \
diff --git openjdk/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
-index 5b21888..3b9297f 100644
+index c23e96e..484afca 100644
--- openjdk/jdk/make/common/shared/Platform.gmk
+++ openjdk/jdk/make/common/shared/Platform.gmk
@@ -159,9 +159,9 @@ ifeq ($(SYSTEM_UNAME), Linux)
@@ -215,32 +173,11 @@ index 5b21888..3b9297f 100644
endif
archExpr = case "$(mach)" in \
i[3-9]86) \
-diff --git openjdk/hotspot/make/linux/makefiles/build_vm_def.sh openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
-index ea81ff6..6a3765b 100644
---- openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
-+++ openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
-@@ -1,10 +1,12 @@
- #!/bin/sh
-
- # If we're cross compiling use that path for nm
--if [ "$CROSS_COMPILE_ARCH" != "" ]; then
--NM=$ALT_COMPILER_PATH/nm
--else
--NM=nm
-+if [ "$NM" == "" ]; then
-+ if [ "$CROSS_COMPILE_ARCH" != "" ]; then
-+ NM=$ALT_COMPILER_PATH/nm
-+ else
-+ NM=nm
-+ fi
- fi
-
- $NM --defined-only $* \
diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
-index 8130b9b..7906531 100644
+index cd336a2..1e5f8e5 100644
--- openjdk/jdk/make/java/nio/Makefile
+++ openjdk/jdk/make/java/nio/Makefile
-@@ -834,8 +834,12 @@ else
+@@ -934,8 +934,12 @@ else
$(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
$(prep-target)
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
@@ -253,7 +190,7 @@ index 8130b9b..7906531 100644
#
# Generated sun.nio.cs SingleByte classes
#
-@@ -869,8 +873,12 @@ else
+@@ -969,8 +973,12 @@ else
$(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
$(prep-target)
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
@@ -266,7 +203,7 @@ index 8130b9b..7906531 100644
GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
-@@ -891,7 +899,11 @@ else
+@@ -991,7 +999,11 @@ else
$(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
$(prep-target)
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
@@ -278,11 +215,73 @@ index 8130b9b..7906531 100644
+endif
.PHONY: sources
+diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
+index b6e0d99..edc530e 100644
+--- openjdk/jdk/make/sun/awt/mawt.gmk
++++ openjdk/jdk/make/sun/awt/mawt.gmk
+@@ -151,22 +151,6 @@ else
+ #endif
+
+ LIBXTST = -lXtst
+-ifeq ($(PLATFORM), linux)
+- ifeq ($(ARCH_DATA_MODEL), 64)
+- # XXX what about the rest of them?
+- LIBXT = -lXt
+- else
+- # Allows for builds on Debian GNU Linux, X11 is in a different place
+- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
+- $(wildcard /usr/lib/libXt.a))
+- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
+- $(wildcard /usr/lib/libSM.a))
+- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
+- $(wildcard /usr/lib/libICE.a))
+- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
+- $(wildcard /usr/lib/libXtst.a))
+- endif
+-endif
+
+ # Use -lXmu for EditRes support
+ LIBXMU_DBG = -lXmu
+@@ -181,7 +165,7 @@ ifneq (,$(findstring $(PLATFORM), linux macosx))
+ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
+ # XXX what is this define below? Isn't it motif-related?
+ OTHER_CFLAGS += -DXMSTRINGDEFINES=1
+-OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
++OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lXi -lX11
+ endif
+
+ endif
+@@ -230,12 +214,6 @@ else
+ CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
+ endif
+
+-ifndef HEADLESS
+-CPPFLAGS += -I$(OPENWIN_HOME)/include
+-LDFLAGS += -L$(OPENWIN_LIB)
+-
+-endif # !HEADLESS
+-
+ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+ -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
+ -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
+@@ -269,12 +247,6 @@ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
+ endif # !HEADLESS
+ endif # PLATFORM
+
+-ifeq ($(PLATFORM), linux)
+- # Checking for the X11/extensions headers at the additional location
+- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
+- $(wildcard /usr/include/X11/extensions))
+-endif
+-
+ ifeq ($(PLATFORM), macosx))
+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+ -I$(OPENWIN_HOME)/include
diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
-index e7d54e2..ce8819c 100644
+index 53d31f3..183c063 100644
--- openjdk/jdk/make/sun/xawt/Makefile
+++ openjdk/jdk/make/sun/xawt/Makefile
-@@ -188,20 +188,6 @@ else
+@@ -198,20 +198,6 @@ else
CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/glib2
endif
@@ -303,19 +302,36 @@ index e7d54e2..ce8819c 100644
# We have some odd logic here because some Solaris 10 updates
# have a render.h file that suggests gradients are supported, but
# the Xrender.h doesn't have the corresponding type definitions.
-@@ -312,11 +298,7 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
+@@ -292,16 +278,10 @@ ifeq ($(ARCH_DATA_MODEL), 32)
+ SIZERS = $(SIZER).32
+ SIZERS_C = $(SIZER_32_C)
+ SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
+-ifdef CROSS_COMPILE_ARCH
+-CFLAGS_32 = -m32
+-endif
+ else # !32
+ SIZERS = $(SIZER).64
+ SIZERS_C = $(SIZER_64_C)
+ SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
+-ifdef CROSS_COMPILE_ARCH
+-CFLAGS_64 = -m64
+-endif
+ endif # 32
+ endif # !macosx
+ endif # solaris
+@@ -337,11 +317,7 @@ WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
+ WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class
+ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
- $(SIZERS): $(SIZERS_C)
- $(prep-target)
-ifndef CROSS_COMPILE_ARCH
- $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
+ SIZERS_CC = $(CC)
-else
-- $(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
+-SIZERS_CC = $(HOST_CC)
-endif
- $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
+ $(SIZERS): $(SIZERS_C)
$(prep-target)
-@@ -329,6 +311,16 @@ $(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
+@@ -358,6 +334,16 @@ $(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
$(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
$(SIZES): $(SIZERS)
@@ -332,7 +348,7 @@ index e7d54e2..ce8819c 100644
@if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
$(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
$(CP) $(PREDEFINED_SIZES_TMPL) $@; \
-@@ -337,6 +329,7 @@ $(SIZES): $(SIZERS)
+@@ -366,6 +352,7 @@ $(SIZES): $(SIZERS)
$(ECHO) GENERATING $@; \
$(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
fi
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-fix-xrender.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch
index 4bd8b2c..4bd8b2c 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-fix-xrender.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-dlvsym-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch
index 657f722..657f722 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-dlvsym-uclibc.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch
index faa90ea..faa90ea 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch
index 7c5da59..7c5da59 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isfinte.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch
new file mode 100644
index 0000000..b2ddfa9
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch
@@ -0,0 +1,13 @@
+diff --git openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+index 659d4da..68a06d5 100644
+--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+@@ -253,7 +253,7 @@ inline int g_isnan(double f) { return isnand(f); }
+ #elif defined(__APPLE__)
+ inline int g_isnan(double f) { return isnan(f); }
+ #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
+-inline int g_isnan(float f) { return isnanf(f); }
++inline int g_isnan(float f) { return __isnanf(f); }
+ inline int g_isnan(double f) { return isnan(f); }
+ #else
+ #error "missing platform-specific definition here"
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
index 7da41fd..7da41fd 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-loadavg.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch
index 68f8581..68f8581 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-nio-use-host-cc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch
index 6b14673..6b14673 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-nio-use-host-cc.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch
index cc5e4e8..cc5e4e8 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-ppc64-jvm-cfg.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch
index 5bb7604..5bb7604 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-ppc64-jvm-cfg.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch
index 5423fde..5423fde 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-remove-unused-backtrace.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch
index 7e98767..7e98767 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-unpack-uclibc.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch
index b97745d..b97745d 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-launcher-stdc++.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch
new file mode 100644
index 0000000..d6a599c
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch
@@ -0,0 +1,188 @@
+diff --git openjdk/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
+index 4ae967f..fe669a9 100644
+--- openjdk/jdk/make/com/sun/nio/sctp/Makefile
++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile
+@@ -64,11 +64,11 @@ ifneq ($(COMPILER_WARNINGS_FATAL),false)
+ COMPILER_WARNINGS_FATAL=true
+ endif
+ #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
+-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
+ endif
+ ifeq ($(PLATFORM), solaris)
+ #LIBSCTP = -lsctp
+-OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
++OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -ljavanet -lnio
+ endif # PLATFORM
+
+ else # windows
+diff --git openjdk/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
+index 7283e45..720f3d3 100644
+--- openjdk/jdk/make/java/net/Makefile
++++ openjdk/jdk/make/java/net/Makefile
+@@ -25,7 +25,7 @@
+
+ BUILDDIR = ../..
+ PACKAGE = java.net
+-LIBRARY = net
++LIBRARY = javanet
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+
+diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
+index 191f17d..1e5f8e5 100644
+--- openjdk/jdk/make/java/nio/Makefile
++++ openjdk/jdk/make/java/nio/Makefile
+@@ -369,7 +369,7 @@ ifeq ($(PLATFORM),windows)
+ endif
+
+ ifeq ($(PLATFORM), linux)
+- OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
++ OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL)
+ ifdef USE_SYSTEM_GIO
+ OTHER_LDLIBS += $(GIO_LIBS)
+ OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
+@@ -379,12 +379,12 @@ ifeq ($(PLATFORM), linux)
+ endif
+
+ ifeq ($(PLATFORM), macosx)
+-OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread
++OTHER_LDLIBS += -L$(LIBDIR) -ljava -ljavanet -pthread
+ endif
+
+ ifeq ($(PLATFORM), solaris)
+ OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
+- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
++ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
+ endif # PLATFORM
+
+ ifdef COMPILE_AGAINST_SYSCALLS
+diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
+index b7f0f2f..b093868 100644
+--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
+@@ -69,7 +69,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
+ */
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ }
+
+ /**
+diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
+index c6a38ad..97de65b 100644
+--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
++++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
+@@ -78,7 +78,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
+ */
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ }
+
+ /**
+diff --git openjdk/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
+index 195ee86..6822a57 100644
+--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
++++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
+@@ -47,7 +47,7 @@ class DatagramPacket {
+ */
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ init();
+ }
+
+diff --git openjdk/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
+index 3ea28e4..7c78eae 100644
+--- openjdk/jdk/src/share/classes/java/net/InetAddress.java
++++ openjdk/jdk/src/share/classes/java/net/InetAddress.java
+@@ -260,7 +260,7 @@ class InetAddress implements java.io.Serializable {
+ static {
+ preferIPv6Address = java.security.AccessController.doPrivileged(
+ new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
+- AccessController.doPrivileged(new LoadLibraryAction("net"));
++ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
+ init();
+ }
+
+diff --git openjdk/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
+index 6314d15..761fdda 100644
+--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
++++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
+@@ -53,7 +53,7 @@ public final class NetworkInterface {
+ private static final int defaultIndex; /* index of defaultInterface */
+
+ static {
+- AccessController.doPrivileged(new LoadLibraryAction("net"));
++ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
+ init();
+ defaultInterface = DefaultInterface.getDefault();
+ if (defaultInterface != null) {
+diff --git openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
+index 5baca6e..befd0b9 100644
+--- openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
++++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
+@@ -76,6 +76,6 @@ public final class SdpSupport {
+
+ static {
+ AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ }
+ }
+diff --git openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
+index d7aa358..9b2c719 100644
+--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
++++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
+@@ -95,7 +95,7 @@ public class DefaultProxySelector extends ProxySelector {
+ }});
+ if (b != null && b.booleanValue()) {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ hasSystemProxies = init();
+ }
+ }
+diff --git openjdk/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
+index 10662df..34d441a 100644
+--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
++++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
+@@ -483,7 +483,7 @@ class Util {
+ return;
+ loaded = true;
+ java.security.AccessController
+- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
++ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
+ java.security.AccessController
+ .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
+ // IOUtil must be initialized; Its native methods are called from
+diff --git openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
+index 3695b5d..7c833cc 100644
+--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
++++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
+@@ -247,7 +247,7 @@ public class ResolverConfigurationImpl
+
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ }
+
+ }
+diff --git openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
+index 7970885..46ab112 100644
+--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
++++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
+@@ -159,7 +159,7 @@ public class ResolverConfigurationImpl
+
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ init0();
+
+ // start the address listener thread
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch
new file mode 100644
index 0000000..f78f2b3
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch
@@ -0,0 +1,16 @@
+diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+index 42f6843..765fc6d 100644
+--- openjdk/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -149,11 +149,6 @@ else
+ CFLAGS += -pipe
+ endif
+
+-# Compiler warnings are treated as errors
+-ifneq ($(COMPILER_WARNINGS_FATAL),false)
+-WARNINGS_ARE_ERRORS = -Werror
+-endif
+-
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+ # conversions which might affect the values. To avoid that, we need to turn
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch
index f40bc51..f40bc51 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-shark-arm-linux-cpu-detection.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch
index b5219da..c03b23c 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-unbreak-float.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch
@@ -1,7 +1,9 @@
+diff --git openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
+index c24c781..ccdc41a 100644
--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
-@@ -26,13 +26,11 @@
-
+@@ -32,13 +32,11 @@
+ #endif
#include "jfdlibm.h"
-#ifdef __NEWVALID /* special setup for Sun test regime */
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch
index a63506b..83dba2b 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch
@@ -1,12 +1,13 @@
-diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make b/hotspot/make/linux/makefiles/zeroshark.make
-index 4cf1826..4c0105b 100644
+diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+index c2a1484..156bdd0 100644
--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
-@@ -32,26 +32,27 @@ Obj_Files += cppInterpreter_arm.o
+@@ -32,26 +32,28 @@ Obj_Files += cppInterpreter_arm.o
Obj_Files += thumb2.o
CFLAGS += -DHOTSPOT_ASM
+CCFLAGS += -DHOTSPOT_ASM
++
cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
thumb2.o: offsets_arm.s
@@ -17,9 +18,9 @@ index 4cf1826..4c0105b 100644
+ $(QEMU) ./mkoffsets > $@
bytecodes_arm.s: bytecodes_arm.def mkbc
- @echo Generatine ARM assembler bytecode sequences
-- $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
-+ $(CC_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE)
+ @echo Generating ARM assembler bytecode sequences
+- $(CC_COMPILE) $(CFLAGS) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
++ $(CC_COMPILE) $(CFLAGS) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE)
mkbc: $(GAMMADIR)/tools/mkbc.c
@echo Compiling mkbc tool
@@ -29,8 +30,8 @@ index 4cf1826..4c0105b 100644
mkoffsets: asm_helper.cpp
@echo Compiling offset generator
$(QUIETLY) $(REMOVE_TARGET)
-- $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
-+ $(CC_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
++ $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -static -o $@ $< $(COMPILE_DONE)
endif
diff --git a/recipes-core/openjdk/openjdk-7-03b21/jvm.cfg b/recipes-core/openjdk/openjdk-7-25b30/jvm.cfg
index ea97cda..ea97cda 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/jvm.cfg
+++ b/recipes-core/openjdk/openjdk-7-25b30/jvm.cfg
diff --git a/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch b/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch
new file mode 100644
index 0000000..00b9660
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch
@@ -0,0 +1,47 @@
+Index: openjdk/jdk/src/share/classes/java/net/URLClassLoader.java
+===================================================================
+--- openjdk.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-13 16:58:42.000000000 +0200
++++ openjdk/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-28 18:43:50.114802612 +0200
+@@ -438,14 +438,12 @@
+ // Use (direct) ByteBuffer:
+ CodeSigner[] signers = res.getCodeSigners();
+ CodeSource cs = new CodeSource(url, signers);
+- sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0);
+ return defineClass(name, bb, cs);
+ } else {
+ byte[] b = res.getBytes();
+ // must read certificates AFTER reading bytes.
+ CodeSigner[] signers = res.getCodeSigners();
+ CodeSource cs = new CodeSource(url, signers);
+- sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0);
+ return defineClass(name, b, 0, b.length, cs);
+ }
+ }
+Index: openjdk/jdk/src/share/classes/java/lang/ClassLoader.java
+===================================================================
+--- openjdk.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-13 16:58:42.000000000 +0200
++++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-28 18:43:50.142802778 +0200
+@@ -422,10 +422,6 @@
+ long t1 = System.nanoTime();
+ c = findClass(name);
+
+- // this is the defining class loader; record the stats
+- sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0);
+- sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1);
+- sun.misc.PerfCounter.getFindClasses().increment();
+ }
+ }
+ if (resolve) {
+Index: openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java
+===================================================================
+--- openjdk.orig/jdk/src/share/classes/java/util/zip/ZipFile.java
++++ openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java
+@@ -213,8 +213,6 @@ class ZipFile implements ZipConstants, Closeable {
+ this.zc = ZipCoder.get(charset);
+ long t0 = System.nanoTime();
+ jzfile = open(name, mode, file.lastModified(), usemmap);
+- sun.misc.PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0);
+- sun.misc.PerfCounter.getZipFileCount().increment();
+ this.name = name;
+ this.total = getTotal(jzfile);
+ this.locsig = startsWithLOC(jzfile);
diff --git a/recipes-core/openjdk/openjdk-7-release-03b21.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc
index 07b1f7a..363b6e2 100644
--- a/recipes-core/openjdk/openjdk-7-release-03b21.inc
+++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc
@@ -2,7 +2,7 @@ require openjdk-7-common.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b21:"
+FILESPATH =. "${FILE_DIRNAME}/openjdk-7-25b30:"
# Name of the directory containing the compiled output
BUILD_DIR = "openjdk.build"
@@ -13,50 +13,29 @@ ARM_INSTRUCTION_SET_armv4t = "ARM"
ICEDTEA_URI = "http://icedtea.classpath.org/download/source/${ICEDTEA}.tar.gz;name=iced"
-ICEDTEA_PREFIX = "icedtea7-forest-2.1"
+ICEDTEA_PREFIX = "icedtea7-forest-2.3"
ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}"
-OPENJDK_CHANGESET = "22cc03983e20"
OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2"
OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false"
-SRC_URI[openjdk.md5sum] = "f98b0f7a69f9427a5b3775dddddc89cb"
-SRC_URI[openjdk.sha256sum] = "758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e"
-HOTSPOT_CHANGESET = "0e651e004747"
HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.gz"
HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false"
-SRC_URI[hotspot.md5sum] = "edd627c8781161eb33006ed668d833e0"
-SRC_URI[hotspot.sha256sum] = "d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1"
-CORBA_CHANGESET = "5617f6c5cc94"
CORBA_FILE = "${CORBA_CHANGESET}.tar.gz"
CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false"
-SRC_URI[corba.md5sum] = "920f1a788a7fdef29a5cd70892331251"
-SRC_URI[corba.sha256sum] = "963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3"
-JAXP_CHANGESET = "1cf75c0e2c96"
JAXP_FILE = "${JAXP_CHANGESET}.tar.gz"
JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false"
-SRC_URI[jaxp.md5sum] = "56e609548b322149cb84604f232a4602"
-SRC_URI[jaxp.sha256sum] = "8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e"
-JAXWS_CHANGESET = "7edfbfe974f2"
JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz"
JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false"
-SRC_URI[jaxws.md5sum] = "2deecec809ea8e38835678889c2bc3ac"
-SRC_URI[jaxws.sha256sum] = "823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa"
-JDK_CHANGESET = "50f6f276a06c"
JDK_FILE = "${JDK_CHANGESET}.tar.gz"
JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false"
-SRC_URI[jdk.md5sum] = "7ee77eeeff600c5a4763b4ac76fd62bc"
-SRC_URI[jdk.sha256sum] = "5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d"
-LANGTOOLS_CHANGESET = "b534c4c6cd9b"
LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz"
LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false"
-SRC_URI[langtools.md5sum] = "16b72f3fea8ac4e5b50de693e87f9c53"
-SRC_URI[langtools.sha256sum] = "c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c"
CACAO_VERSION = "a567bcb7f589"
CACAO_FILE = "${CACAO_VERSION}.tar.gz"
@@ -64,7 +43,7 @@ CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_FILE};nam
SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73"
SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9"
-JAMVM_VERSION = "4617da717ecb05654ea5bb9572338061106a414d"
+JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82"
JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz"
JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false"
SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b"
@@ -76,20 +55,26 @@ OEPATCHES = "\
file://cacao-libtoolize.patch \
file://cacao-loadavg-makefile.patch \
file://fix_hotspot_crosscompile.patch \
- file://fix-checksums.patch \
- file://jamvm-extract.patch \
+ file://cacao-update.patch \
file://cacao-loadavg.patch;apply=no \
file://cacao-arm-ucontext.patch;apply=no \
+ file://remove-sun.misc.Perf-debug-code.patch;apply=no \
+ file://fix-checksums.patch \
"
+# overrride the jamvm patch for now, needs to be solved upstream
+do_unpackpost() {
+ cp ${WORKDIR}/remove-sun.misc.Perf-debug-code.patch ${S}/patches/jamvm
+}
+
+addtask unpackpost after do_unpack before do_patch
+
# Allow overriding this separately
ICEDTEAPATCHES = "\
file://icedtea-crosscompile-fix.patch;apply=no \
- file://icedtea-hostbuildcc.patch;apply=no \
file://icedtea-unbreak-float.patch;apply=no \
file://icedtea-remove_werror.patch;apply=no \
file://icedtea-libnet-renaming.patch;apply=no \
- file://icedtea-fix-xrender.patch;apply=no \
file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \
file://icedtea-corba-parallel-make.patch;apply=no \
file://icedtea-zero-hotspotfix.patch;apply=no \
@@ -117,11 +102,9 @@ ICEDTEAPATCHES_append_libc-uclibc = " \
# Allow overriding this separately
DISTRIBUTION_PATCHES = "\
patches/icedtea-crosscompile-fix.patch \
- patches/icedtea-hostbuildcc.patch \
patches/icedtea-unbreak-float.patch \
patches/icedtea-remove_werror.patch \
patches/icedtea-libnet-renaming.patch \
- patches/icedtea-fix-xrender.patch \
patches/icedtea-shark-arm-linux-cpu-detection.patch \
patches/icedtea-corba-parallel-make.patch \
patches/icedtea-zero-hotspotfix.patch \
diff --git a/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bb b/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bb
deleted file mode 100644
index c7c0a06..0000000
--- a/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-require openjdk-7-release-03b21.inc
-
-PR = "${INC_PR}.0"
-
-
-SRC_URI[iced.md5sum] = "2921e31983a3874860cd784548af3ab9"
-SRC_URI[iced.sha256sum] = "ea68180fe8b40732ccea41cdd6c628de4f660b20fccb4cd87ab35f0727c08b11"
-
-OPENJDK_CHANGESET = "c1c649636704"
-SRC_URI[openjdk.md5sum] = "8da834a30f5f2b022b5c30bc14caef66"
-SRC_URI[openjdk.sha256sum] = "19018c45d97cecd9c753a6fc4b52af57cc93b65e3ee303c0750a7961171d5f3d"
-
-CORBA_CHANGESET = "313f1ee32118"
-SRC_URI[corba.md5sum] = "2c45acbfbc6af4bdcc16a2bb258ac5e4"
-SRC_URI[corba.sha256sum] = "9326c1fc0dedcbc2af386cb73b80727416e24664ccbf766221450f6e2138e952"
-
-JAXP_CHANGESET = "c04b95aa746c"
-SRC_URI[jaxp.md5sum] = "213491d6555fa4e380f8878e55b17e20"
-SRC_URI[jaxp.sha256sum] = "9df7d4d04168c9c6e57c5b51ca3a54defe5e892d56a256b3d3deda3b12173e63"
-
-JAXWS_CHANGESET = "d04602077b14"
-SRC_URI[jaxws.md5sum] = "628d1847ded0f020722ca5fb94e0969a"
-SRC_URI[jaxws.sha256sum] = "1ca9cb115591eb20143cf0d88a57f07fb631ea41246d05017e30a6ae3766517d"
-
-JDK_CHANGESET = "acaa2de9f547"
-SRC_URI[jdk.md5sum] = "46b123734ac2c028248647b07c76907d"
-SRC_URI[jdk.sha256sum] = "bbfa99c5d9900d16a9359fbdfd1cca9cbfd49095a823eb06ca56d75bca0a8eaf"
-
-LANGTOOLS_CHANGESET = "c63c8a2164e4"
-SRC_URI[langtools.md5sum] = "01715103e35a972a747c5f43f75cb4c0"
-SRC_URI[langtools.sha256sum] = "46d93bd9069d86ea233464d5a9777b12f0a027142b9ac665e3b244f69a5416b6"
-
-HOTSPOT_CHANGESET = "2c4981784101"
-SRC_URI[hotspot.md5sum] = "097f2fbd2fca7c40b2c502fcb343432e"
-SRC_URI[hotspot.sha256sum] = "977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b"
-
diff --git a/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb b/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
new file mode 100644
index 0000000..9058e42
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
@@ -0,0 +1,36 @@
+require openjdk-7-release-25b30.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[iced.md5sum] = "9b3afa162021e3fca6161ba8f9f7dc11"
+SRC_URI[iced.sha256sum] = "3c4e88e7c1b2b39dcd7ed65c3b9a1a8dbd2a48848ce42e1d8a22a6821cf890d1"
+
+CORBA_CHANGESET = "ea108ff3be9a"
+SRC_URI[corba.md5sum] = "f76840f24d112a8fe259cb4122415a25"
+SRC_URI[corba.sha256sum] = "818f5613b218fe2a2036e6c65622b970839986c0c1ca95563f911b379a52b765"
+
+JAXP_CHANGESET = "332f0234a53e"
+SRC_URI[jaxp.md5sum] = "1b11d9fa16e7bf7613a8b9d32f6a586a"
+SRC_URI[jaxp.sha256sum] = "a3f99615331cdc3d5e38e7169bb4b03dc43ede25c73834114240b8768207b9dc"
+
+JAXWS_CHANGESET = "fdc4ad9f30c6"
+SRC_URI[jaxws.md5sum] = "f6eb8fcbf99d0914149b0e2deac0e34c"
+SRC_URI[jaxws.sha256sum] = "b149c1fab323a586eae9b4459ccd929f0db8b35769e42dd7f4fbadc48b803dab"
+
+JDK_CHANGESET = "4a0cf2c05cc6"
+SRC_URI[jdk.md5sum] = "89f3dac9c06581fd8b4f1b1103a6c2f9"
+SRC_URI[jdk.sha256sum] = "badbbf50c820325ffe592762a2eff3414df71e286460b75716a2100d7f6f2aa0"
+
+LANGTOOLS_CHANGESET = "6c9b532f4281"
+SRC_URI[langtools.md5sum] = "e932425860de3b52358cff66b9ceadbf"
+SRC_URI[langtools.sha256sum] = "b9e2e3c97393f566b0c4dc2b0ca826bfb3b3841f5522a850b82d1ff23745839b"
+
+OPENJDK_CHANGESET = "e62743867f54"
+SRC_URI[openjdk.md5sum] = "5680583c82703031d6acb0a141fd328f"
+SRC_URI[openjdk.sha256sum] = "d1132bdde0e19d8e4d2516213bce7aa50b4b6d1ab04a82bf7a0440d6184db842"
+
+# located in hotspot.map
+HOTSPOT_CHANGESET = "37b254871acb"
+SRC_URI[hotspot.md5sum] = "57f2077c4d4237de44b788e0a8456c83"
+SRC_URI[hotspot.sha256sum] = "60268f9d792575ec26b8796753246aca70282937327c2fa855b3f0010638605e"
+