merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'

     and '77f81ea18669b5c79145faa5f0a96df1d7db3232'

113 files changed, 1884 insertions, 1198 deletions

diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc
index 0d2b4c7ae1..e08cd5ec80 100644
--- a/packages/cacao/cacao.inc
+++ b/packages/cacao/cacao.inc
@@ -15,17 +15,33 @@ RPROVIDES_cacao = "java2-runtime"
 
 inherit java autotools update-alternatives
 
+# Old and new options do not interfere.
 EXTRA_OECONF = "\
 	${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
 	--enable-debug \
+	--with-vm-zip=${datadir}/cacao/vm.zip \
 	--with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
+  ${OLD_CACAO_OECONF} \
+  ${NEW_CACAO_OECONF} \
+  "
+
+# Options needed for Cacao < 0.99 (including hg snapshots)
+OLD_CACAO_OECONF = "\
 	--with-classpath-includedir=${STAGING_INCDIR}/classpath \
 	--with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
 	--with-target-classpath-classes=${datadir}/classpath/glibj.zip \
-	--with-vm-zip=${datadir}/cacao/vm.zip \
-	--with-classpath-libdir=${libdir} \
+	--with-classpath-libdir=${libdir_jni}:${libdir} \
 	"
 
+# Options needed for Cacao >= 0.99
+NEW_CACAO_OECONF = "\
+  --with-build-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+  --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
+  --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \
+  --with-jni_md_h=${STAGING_INCDIR}/classpath \
+  --with-jni_h=${STAGING_INCDIR}/classpath \
+  "
+
 PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
 
 FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}