jamvm-native: Depend on ecj-initial (instead of virtual/javac-native), provide virtua...

diff --git a/packages/jamvm/jamvm-native.inc b/packages/jamvm/jamvm-native.inc
index fc9023a62c7581e0a52667a73aa8bb5e8f2ef35a..c3e4f84a60357aa6dcbed307b57858c9ce553a52 100644 (file)
--- a/packages/jamvm/jamvm-native.inc
+++ b/packages/jamvm/jamvm-native.inc
@@ -1,9 +1,9 @@
 require jamvm.inc 
 
-DEPENDS = "zlib-native classpath-native virtual/javac-native"
+DEPENDS = "zlib-native classpath-native ecj-initial"
 RDEPENDS = ""
 
-PROVIDES_jamvm = "virtual/java-native"
+PROVIDES = "virtual/java-native"
 
 RPROVIDES_jamvm = ""
 
@@ -17,3 +17,7 @@ S = "${WORKDIR}/jamvm-${PV}"
 do_install_append() {
   ln -sf jamvm ${STAGING_BINDIR}/java
 }
+
+# Enforce usage of ecj-initial.
+export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial"
+

diff --git a/packages/jamvm/jamvm-native_1.5.1.bb b/packages/jamvm/jamvm-native_1.5.1.bb
index e174e2a312b680314574b7d5502aba3ee148bb95..3b42dbbef6f2b9f4498c4724da7bdf39bf4be4a8 100644 (file)
--- a/packages/jamvm/jamvm-native_1.5.1.bb
+++ b/packages/jamvm/jamvm-native_1.5.1.bb
@@ -1,4 +1,4 @@
 require jamvm-native.inc
 
-PR = "r0"
+PR = "r1"