Merge branch 'yocto_1.8' of https://github.com/mindrunner/meta-java into pending

* 'yocto_1.8' of https://github.com/mindrunner/meta-java:
  openjdk-7: inherit pkgconfig
  ecj: fix unpackpost task
  openjdk: add pkgconfig support
  README: minor fixes
  README: update openjdk6 to the latest icedtea version
  openjdk6: add version 1.13.4
  jamvm: update git url to sourceforge while berlios is gone
  java-test-image: add jamvm, cacao and classpath
  jamvm: update git version to ebd11bde0a97b57f0d18938c6b65468d3c932719
  jamvm: add inherit pkgconfig
  README: update for icedtea version 1.12.8
  cacao: fix target compilation and packaging
  openjdk-common.inc: fix qemu usage
  openjdk6: update icedtea 1.12 to version 1.12.8
  libmatthew: Remove the dummy jar symlink
  openjdk-7-release-25b30.inc: add patch to fix hotstop build
  openjdk-7-release-25b30.inc: move nio patch to main section.
  openjdk-7-25b30: Forward port ppc patches

1 files changed, 41 insertions, 0 deletions

diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
new file mode 100644
index 0000000..91ace0e
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch
@@ -0,0 +1,41 @@
+diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+index c2a1484..f460d85 100644
+--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -32,13 +32,20 @@ Obj_Files += cppInterpreter_arm.o
+ Obj_Files += thumb2.o
+ 
+ CFLAGS += -DHOTSPOT_ASM
++CCFLAGS += -DHOTSPOT_ASM
++
++ifeq ($(CROSS_COMPILATION), true)
++       C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD)
++else
++       C_COMPILE_FOR_MKBC = $(C_COMPILE)
++endif
+ 
+ cppInterpreter_arm.o:  offsets_arm.s bytecodes_arm.s
+ thumb2.o:              offsets_arm.s
+ 
+ offsets_arm.s: mkoffsets
+        @echo Generating assembler offsets
+-       ./mkoffsets > $@
++       $(QEMU) ./mkoffsets > $@
+ 
+ bytecodes_arm.s: bytecodes_arm.def mkbc
+        @echo Generating ARM assembler bytecode sequences
+@@ -46,12 +53,12 @@ bytecodes_arm.s: bytecodes_arm.def mkbc
+ 
+ mkbc:  $(GAMMADIR)/tools/mkbc.c
+        @echo Compiling mkbc tool
+-       $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
++       $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE)
+ 
+ mkoffsets:     asm_helper.cpp
+        @echo Compiling offset generator
+        $(QUIETLY) $(REMOVE_TARGET)
+-       $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
++       $(CC_COMPILE) $(CFLAGS) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+ 
+ endif
+