1 files changed, 82 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-xawt-crosscompile-fix.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-xawt-crosscompile-fix.patch
new file mode 100644
index 0000000..5eb5507
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-xawt-crosscompile-fix.patch
@@ -0,0 +1,82 @@
+--- openjdk/jdk/make/sun/xawt/Makefile
+++ openjdk/jdk/make/sun/xawt/Makefile
+@@ -201,20 +201,6 @@
+   CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/glib2
+ endif
+ 
+-ifeq ($(PLATFORM), linux)
+-  ifndef CROSS_COMPILE_ARCH
+-    # Allows for builds on Debian GNU Linux, X11 is in a different place 
+-    # This should really be handled at a higher-level so we don't have to
+-    # work-around this when cross-compiling
+-    CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
+-                -I/usr/include/X11/extensions \
+-                -I$(OPENWIN_HOME)/include 
+-  else
+-    CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+-                -I$(OPENWIN_HOME)/include 
+-  endif
+-endif
+-
+ ifeq ($(NATIVE_SUPPORT_DEBUG), true)
+   OTHER_CFLAGS += -DNATIVE_SUPPORT_DEBUG
+ endif
+@@ -299,16 +285,10 @@
+ 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
+@@ -344,15 +324,11 @@
+ WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
+ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
+ 
+-ifndef CROSS_COMPILE_ARCH
+ SIZERS_CC = $(CC)
+-else
+-SIZERS_CC = $(HOST_CC)
+-endif
+ 
+ $(SIZERS): $(SIZERS_C) 
+        $(prep-target)
+-       $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
+       $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -fuse-ld=bfd -o $@ $(SIZER)$(suffix $@).c
+ 
+ $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
+        $(prep-target)
+@@ -365,6 +341,16 @@
+            $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
+ 
+ $(SIZES): $(SIZERS)
+ifdef CROSS_COMPILE_ARCH
+       @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
+               $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
+               $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
+               $(CHMOD) +w $@; \
+       else    \
+               $(ECHO) GENERATING $@; \
+               $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
+       fi
+else 
+        @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
+            $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
+            $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
+@@ -373,6 +359,7 @@
+            $(ECHO) GENERATING $@; \
+            $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
+        fi
+endif
+        @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
+            $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
+            $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \

diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-xawt-crosscompile-fix.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-xawt-crosscompile-fix.patch new file mode 100644 index 0000000..5eb5507 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-xawt-crosscompile-fix.patch
@@ -0,0 +1,82 @@
	1	--- openjdk/jdk/make/sun/xawt/Makefile
	2	+++ openjdk/jdk/make/sun/xawt/Makefile
	3	@@ -201,20 +201,6 @@
	4	CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/glib2
	5	endif
	6
	7	-ifeq ($(PLATFORM), linux)
	8	- ifndef CROSS_COMPILE_ARCH
	9	- # Allows for builds on Debian GNU Linux, X11 is in a different place
	10	- # This should really be handled at a higher-level so we don't have to
	11	- # work-around this when cross-compiling
	12	- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
	13	- -I/usr/include/X11/extensions \
	14	- -I$(OPENWIN_HOME)/include
	15	- else
	16	- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
	17	- -I$(OPENWIN_HOME)/include
	18	- endif
	19	-endif
	20	-
	21	ifeq ($(NATIVE_SUPPORT_DEBUG), true)
	22	OTHER_CFLAGS += -DNATIVE_SUPPORT_DEBUG
	23	endif
	24	@@ -299,16 +285,10 @@
	25	SIZERS = $(SIZER).32
	26	SIZERS_C = $(SIZER_32_C)
	27	SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
	28	-ifdef CROSS_COMPILE_ARCH
	29	-CFLAGS_32 = -m32
	30	-endif
	31	else # !32
	32	SIZERS = $(SIZER).64
	33	SIZERS_C = $(SIZER_64_C)
	34	SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
	35	-ifdef CROSS_COMPILE_ARCH
	36	-CFLAGS_64 = -m64
	37	-endif
	38	endif # 32
	39	endif # !macosx
	40	endif # solaris
	41	@@ -344,15 +324,11 @@
	42	WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class
	43	XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
	44
	45	-ifndef CROSS_COMPILE_ARCH
	46	SIZERS_CC = $(CC)
	47	-else
	48	-SIZERS_CC = $(HOST_CC)
	49	-endif
	50
	51	$(SIZERS): $(SIZERS_C)
	52	$(prep-target)
	53	- $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
	54	+ $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -fuse-ld=bfd -o $@ $(SIZER)$(suffix $@).c
	55
	56	$(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
	57	$(prep-target)
	58	@@ -365,6 +341,16 @@
	59	$(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
	60
	61	$(SIZES): $(SIZERS)
	62	+ifdef CROSS_COMPILE_ARCH
	63	+ @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
	64	+ $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
	65	+ $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
	66	+ $(CHMOD) +w $@; \
	67	+ else \
	68	+ $(ECHO) GENERATING $@; \
	69	+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
	70	+ fi
	71	+else
	72	@if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
	73	$(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
	74	$(CP) $(PREDEFINED_SIZES_TMPL) $@; \
	75	@@ -373,6 +359,7 @@
	76	$(ECHO) GENERATING $@; \
	77	$(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
	78	fi
	79	+endif
	80	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
	81	$(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
	82	$(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \