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, 13 insertions, 0 deletions

diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch
new file mode 100644
index 0000000..55f1f9c
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch
@@ -0,0 +1,13 @@
+diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile
+index eaf8a6e..4938613 100644
+--- openjdk/jdk/make/com/sun/jmx/Makefile
++++ openjdk/jdk/make/com/sun/jmx/Makefile
+@@ -102,7 +102,7 @@ FILES_ties   = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/
+ # when available, we need to run with latest rmic version available. rmic 
+ # launch tool not built at this stage but we can invoke via rmi class.
+ 
+-RMIC_JAVA = $(OUTPUTDIR)/bin/java
++RMIC_JAVA = $(BOOTDIR)/bin/java
+ # need to treat 64bit solaris differently
+ ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
+ RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java