6 files changed, 75 insertions, 49 deletions

diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch b/recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch
new file mode 100644
index 0000000..c21fcf1
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch
@@ -0,0 +1,24 @@
+Index: cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c
+===================================================================
+--- cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c     2013-01-26 21:30:54.206581090 +0100
++++ cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c     2013-01-26 21:31:34.406991316 +0100
+@@ -28,19 +28,7 @@
+ 
+ #include <stdint.h>
+ 
+-#define ucontext broken_glibc_ucontext
+-#define ucontext_t broken_glibc_ucontext_t
+ #include <ucontext.h>
+-#undef ucontext
+-#undef ucontext_t
+-
+-typedef struct ucontext {
+-   unsigned long     uc_flags;
+-   struct ucontext  *uc_link;
+-   stack_t           uc_stack;
+-   struct sigcontext uc_mcontext;
+-   sigset_t          uc_sigmask;
+-} ucontext_t;
+ 
+ #define scontext_t struct sigcontext
+ 
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch b/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch
index 0f50c6c..81ac590 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch
+++ b/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch
@@ -1,12 +1,13 @@
-Index: icedtea6/Makefile.am
+Index: icedtea-2.1.4/Makefile.am
 ===================================================================
---- icedtea6.orig/Makefile.am   2011-12-20 10:54:09.000000000 +0100
-+++ icedtea6/Makefile.am        2011-12-20 11:49:12.810009279 +0100
-@@ -1921,6 +1921,7 @@
+--- icedtea-2.1.4.orig/Makefile.am      2013-01-26 18:20:55.152561203 +0100
++++ icedtea-2.1.4/Makefile.am   2013-01-26 18:41:07.637992206 +0100
+@@ -1994,6 +1994,8 @@
  if BUILD_CACAO
  if !USE_SYSTEM_CACAO
         cd cacao/cacao && \
-+       patch -p1 -N  < $(abs_top_srcdir)/patches/cacao-loadavg.patch && \
++       patch -p1 -N < $(abs_top_srcdir)/patches/cacao-loadavg.patch && \
++        patch -p1 -N < $(abs_top_srcdir)/patches/cacao-arm-ucontext.patch && \
         rm -f libtool && \
         ./autogen.sh && \
         $(ARCH_PREFIX) ./configure \
diff --git a/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch b/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch
index e975707..33da7c4 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch
+++ b/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch
@@ -1,13 +1,13 @@
-Index: 03b21-2.1.3-r2.0/icedtea-2.1.3/Makefile.am
+Index: icedtea-2.1.4/Makefile.am
 ===================================================================
---- icedtea-2.1.3/Makefile.am   2012-11-23 00:40:49.323361758 +0100
-+++ icedtea-2.1.3/Makefile.am   2012-11-23 00:41:55.500083848 +0100
+--- icedtea-2.1.4.orig/Makefile.am      2013-01-26 16:46:50.000000000 +0100
++++ icedtea-2.1.4/Makefile.am   2013-01-26 16:48:49.442977109 +0100
 @@ -18,7 +18,7 @@
- JAXWS_SHA256SUM = 6d0858d46b68d6e8488e70d1675e5b656aeb4ef51e8ee4e330e77219f92c1c0c
- JDK_SHA256SUM = 11146763409098a42dd9896f3fb7e7324a58c5cff5298009eb347ad26abeed51
- LANGTOOLS_SHA256SUM = 3a4039348aa49547fffa96563b77b704c72e2ac3ead2c132843ba1e9fe4dbad2
--OPENJDK_SHA256SUM = 0f2e414fee619e78c33bceaee7c440efa598d651b23a75fd61e1282ad6001839
-+OPENJDK_SHA256SUM = 54a0ef02b56b265b4122324e08a33c42ececbf2a300ada260611e7b6ccdba96d
+ JAXWS_SHA256SUM = 4a60a1af32b4a274579e9932b22d552df6aae00640a3caf6a27109bdc2fe5d5a
+ JDK_SHA256SUM = 1397d8e1f15fb6cb28a8c37fe15c93f8b95d36d5a4c6753cf621d28af620d6bf
+ LANGTOOLS_SHA256SUM = b8c28b2de175694d1b8d6ff94c5ba616250aa3f39f41123e188cfec0b0a14da8
+-OPENJDK_SHA256SUM = 4ee8fda9898f0b90fa05ea31907c20cd28d65bef550a332d35e3bd2f412cd399
++OPENJDK_SHA256SUM = d1953daabbae4efdd61a4c670c1b9d28c595307ff226e13b04dcf989d699fbcf
  
  CACAO_VERSION = a567bcb7f589
  CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff --git a/recipes-core/openjdk/openjdk-7-release-03b21.inc b/recipes-core/openjdk/openjdk-7-release-03b21.inc
index 2038e07..07b1f7a 100644
--- a/recipes-core/openjdk/openjdk-7-release-03b21.inc
+++ b/recipes-core/openjdk/openjdk-7-release-03b21.inc
@@ -79,6 +79,7 @@ OEPATCHES = "\
         file://fix-checksums.patch \
         file://jamvm-extract.patch \
         file://cacao-loadavg.patch;apply=no \
+        file://cacao-arm-ucontext.patch;apply=no \
         "
 
 # Allow overriding this separately
diff --git a/recipes-core/openjdk/openjdk-7_03b21-2.1.3.bb b/recipes-core/openjdk/openjdk-7_03b21-2.1.3.bb
deleted file mode 100644
index a86a032..0000000
--- a/recipes-core/openjdk/openjdk-7_03b21-2.1.3.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-require openjdk-7-release-03b21.inc
-
-PR = "${INC_PR}.0"
-
-ICEDTEA = "icedtea-2.1.3"
-
-SRC_URI[iced.md5sum] = "200e74ad440f9c4bfa21cc2bd94b4325"
-SRC_URI[iced.sha256sum] = "1929e57eb6718d30735e1e04e9e129457f845f7d7a8404b2b028740d0779ddb6"
-
-HOTSPOT_CHANGESET = "a456d0771ba0"
-SRC_URI[hotspot.md5sum] = "23c46cbb8e8a2e04dafa6ef63bc810c4"
-SRC_URI[hotspot.sha256sum] = "09a64fca0beff0759ef1b461d63ed6a00e43032972781bb3a55e49d8b93f67d0"
-
-CORBA_CHANGESET = "79ee8535bc51"
-SRC_URI[corba.md5sum] = "0e04317a6a74fea66ecac51c6171413c"
-SRC_URI[corba.sha256sum] = "f61dad8d484e4a9e645b7fb73da87bc44f9986a074629154f37ed46be05f5b84"
-
-JAXP_CHANGESET = "77e7219c7424"
-SRC_URI[jaxp.md5sum] = "27ea9ad4c7a4c43eb1ccab8a0f365a50"
-SRC_URI[jaxp.sha256sum] = "9cfbc0efaface20f7188870b9bf5b0ebc73d745cd9a49d013cd4e81ba223ccdc"
-
-JAXWS_CHANGESET = "d92eda447bca"
-SRC_URI[jaxws.md5sum] = "4fb688cb0e2c703dfdedca187bb94070"
-SRC_URI[jaxws.sha256sum] = "6d0858d46b68d6e8488e70d1675e5b656aeb4ef51e8ee4e330e77219f92c1c0c"
-
-JDK_CHANGESET = "d7ecb57d3c61"
-SRC_URI[jdk.md5sum] = "0e90a9d980d44998083343a3a7614bb5"
-SRC_URI[jdk.sha256sum] = "11146763409098a42dd9896f3fb7e7324a58c5cff5298009eb347ad26abeed51"
-
-LANGTOOLS_CHANGESET = "fd2fdb20d858"
-SRC_URI[langtools.md5sum] = "48335bb031d4c75e75823e2d70f17ef5"
-SRC_URI[langtools.sha256sum] = "3a4039348aa49547fffa96563b77b704c72e2ac3ead2c132843ba1e9fe4dbad2"
-
-OPENJDK_CHANGESET = "f89009ada191"
-SRC_URI[openjdk.md5sum] = "c26bbb33addfaeb14d28a1329b4b5a3e"
-SRC_URI[openjdk.sha256sum] = "54a0ef02b56b265b4122324e08a33c42ececbf2a300ada260611e7b6ccdba96d"
diff --git a/recipes-core/openjdk/openjdk-7_03b21-2.1.4.bb b/recipes-core/openjdk/openjdk-7_03b21-2.1.4.bb
new file mode 100644
index 0000000..aed17ee
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7_03b21-2.1.4.bb
@@ -0,0 +1,36 @@
+require openjdk-7-release-03b21.inc
+
+PR = "${INC_PR}.0"
+
+ICEDTEA = "icedtea-2.1.4"
+
+SRC_URI[iced.md5sum] = "7d1adfad5cc7f98a57712a5c5e11e1a1"
+SRC_URI[iced.sha256sum] = "7762ce53479e49f8afffc81621515eb6c3f765c578ff13d4c601ce4af8935db6"
+
+HOTSPOT_CHANGESET = "3f345e5f65eb"
+SRC_URI[hotspot.md5sum] = "c995de20564762bd8b9c820d1a7107ca"
+SRC_URI[hotspot.sha256sum] = "fa482a6ace16f95dd53cb99c842da401e634a4536ef1a18280e5d3b7843954b0"
+
+CORBA_CHANGESET = "fccd14ecf86c"
+SRC_URI[corba.md5sum] = "db118d8f30d478758bb9544bc6722d60"
+SRC_URI[corba.sha256sum] = "bc761a960972906ec67b208e94f557bd9d1ceb07ae9020776a4774674d57ff44"
+
+JAXP_CHANGESET = "fb08c190f504"
+SRC_URI[jaxp.md5sum] = "1edd4f7bb4623bb42fb10553bcf2c922"
+SRC_URI[jaxp.sha256sum] = "619254245e5876614689c95cff44124462252bc0c074c85c657a1bac76e04043"
+
+JAXWS_CHANGESET = "77e7849c5e50"
+SRC_URI[jaxws.md5sum] = "c05e26c9d0265dd70da03c749d3e56df"
+SRC_URI[jaxws.sha256sum] = "4a60a1af32b4a274579e9932b22d552df6aae00640a3caf6a27109bdc2fe5d5a"
+
+JDK_CHANGESET = "e7d1cb36e005"
+SRC_URI[jdk.md5sum] = "01f5e22d4f3530a887b7c186d9adeae5"
+SRC_URI[jdk.sha256sum] = "1397d8e1f15fb6cb28a8c37fe15c93f8b95d36d5a4c6753cf621d28af620d6bf"
+
+LANGTOOLS_CHANGESET = "de674a569978"
+SRC_URI[langtools.md5sum] = "bfe0e37cbdd3281a66897c1180f47aa0"
+SRC_URI[langtools.sha256sum] = "b8c28b2de175694d1b8d6ff94c5ba616250aa3f39f41123e188cfec0b0a14da8"
+
+OPENJDK_CHANGESET = "bc612c7c99ec"
+SRC_URI[openjdk.md5sum] = "ec5caa23f2d3f1622b11c56869a0aa4f"
+SRC_URI[openjdk.sha256sum] = "d1953daabbae4efdd61a4c670c1b9d28c595307ff226e13b04dcf989d699fbcf"