openjdk6: apply same fix for ucontext for cacao on arm to openjdk6 too

3 files changed, 31 insertions, 5 deletions

diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch
new file mode 100644
index 0000000..c21fcf1
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b24/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-6-6b24/cacao-loadavg-makefile.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch
index 0f50c6c..95cb802 100644
--- a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch
+++ b/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch
@@ -1,12 +1,13 @@
-Index: icedtea6/Makefile.am
+Index: icedtea6-1.11.5/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 @@
+--- icedtea6-1.11.5.orig/Makefile.am    2013-01-27 21:47:24.609119623 +0100
++++ icedtea6-1.11.5/Makefile.am 2013-01-27 21:49:31.250516775 +0100
+@@ -1993,6 +1993,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-6-release-6b24.inc b/recipes-core/openjdk/openjdk-6-release-6b24.inc
index 1da7ffb..b19bf3a 100644
--- a/recipes-core/openjdk/openjdk-6-release-6b24.inc
+++ b/recipes-core/openjdk/openjdk-6-release-6b24.inc
@@ -68,6 +68,7 @@ OEPATCHES = "\
         file://cacao-loadavg-makefile.patch \
         file://fix_hotspot_crosscompile.patch \
         file://cacao-loadavg.patch;apply=no \
+        file://cacao-arm-ucontext.patch;apply=no \
         "
 
 # Allow overriding this separately