6 files changed, 9 insertions, 57 deletions
diff --git a/packages/cacao/cacao-native.inc b/packages/cacao/cacao-native.inc
index f4eee16cf6..fc86e684c5 100644
--- a/packages/cacao/cacao-native.inc
+++ b/packages/cacao/cacao-native.inc
@@ -17,13 +17,13 @@ EXTRA_OECONF = "\
   --with-vm-zip=${datadir}/cacao/vm.zip \
   \
   --with-classpath-libdir=${libdir_jni}:${libdir} \
-  --with-classpath-includedir=${incdir}/classpath \
+  --with-classpath-includedir=${includedir}/classpath \
   --with-classpath-classes=${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=${incdir}/classpath \
-  --with-jni_h=${incdir}/classpath \
+  --with-jni_md_h=${includedir}/classpath \
+  --with-jni_h=${includedir}/classpath \
   "
 
 # force usage of ecj-initial
diff --git a/packages/cacao/cacao-native_0.98+hg20071001.bb b/packages/cacao/cacao-native_0.98+hg20071001.bb
index 409d2c7858..99fd991c1e 100644
--- a/packages/cacao/cacao-native_0.98+hg20071001.bb
+++ b/packages/cacao/cacao-native_0.98+hg20071001.bb
@@ -3,3 +3,7 @@ require cacao-native.inc
 PR = "r1"
 
 SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
+
+# force usage of ecj-initial (but Java5-compatible class library)
+export JAVAC = "${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
+
diff --git a/packages/cacao/cacao-native_0.99.1.bb b/packages/cacao/cacao-native_0.99.2.bb
index 1cf0cb70cf..943a2890ea 100644
--- a/packages/cacao/cacao-native_0.99.1.bb
+++ b/packages/cacao/cacao-native_0.99.2.bb
@@ -2,6 +2,6 @@ require cacao-native.inc
 
 PR = "r0"
 
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
-  "
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d"
+
 
diff --git a/packages/cacao/cacao_0.99.1.bb b/packages/cacao/cacao_0.99.2.bb
index a503c7d3d4..5618213d2d 100644
--- a/packages/cacao/cacao_0.99.1.bb
+++ b/packages/cacao/cacao_0.99.2.bb
@@ -3,7 +3,6 @@ require cacao.inc
 PR = "r0"
 
 SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
-           file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
           "
 
 # Quirks for Nokia N800:
diff --git a/packages/cacao/cacaoh-native_0.99.1.bb b/packages/cacao/cacaoh-native_0.99.2.bb
index 11735d4f31..11735d4f31 100644
--- a/packages/cacao/cacaoh-native_0.99.1.bb
+++ b/packages/cacao/cacaoh-native_0.99.2.bb
diff --git a/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch b/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
deleted file mode 100644
index dffc37b343..0000000000
--- a/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -r 8484332b813c configure.ac
---- a/configure.ac	Sun Jun 22 18:19:54 2008 +0200
-+++ b/configure.ac	Mon Jun 23 08:53:17 2008 +0200
-@@ -550,6 +550,7 @@
- 
- AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
- AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
-+AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES
- 
- if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
-    AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
-diff -r 8484332b813c m4/java-runtime-library.m4
---- a/m4/java-runtime-library.m4	Sun Jun 22 18:19:54 2008 +0200
-+++ b/m4/java-runtime-library.m4	Mon Jun 23 08:53:17 2008 +0200
-@@ -93,20 +93,32 @@
- AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes])
- AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES)
- 
-+dnl where are Java core library classes located at compilation time
-+
-+AC_DEFUN([AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES],[
-+AC_MSG_CHECKING(where Java core library classes are located at compile time)
-+AC_ARG_WITH([build-java-runtime-library-classes],
-+            [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]])],
-+            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
-+            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip])
-+AC_MSG_RESULT(${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES})
-+AC_DEFINE_UNQUOTED([BUILD_JAVA_RUNTIME_LIBRARY_CLASSES], "${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java core library classes at compile time])
-+AC_SUBST(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)
-+])
-+
- dnl define BOOTCLASSPATH for Makefiles
- case "${WITH_JAVA_RUNTIME_LIBRARY}" in
-     cldc1.1 | gnuclasspath)
--        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
-+        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
-         ;;
-     *)
--        BOOTCLASSPATH="\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
-+        BOOTCLASSPATH="\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
-         ;;
- esac
- AC_SUBST(BOOTCLASSPATH)
- ])
- 
--
--dnl where are Java runtime library native libraries installed
-+dnl where are Java runtime library native libraries installed (at compilation time)
- 
- AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
- AC_MSG_CHECKING(where Java runtime library native libraries are installed)