From f2bfae6033ff398bfb8a1d3320a7602c3fd2c4fc Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@gmx.net>
Date: Thu, 2 Oct 2008 23:47:07 +0000
Subject: ecj-bootstrap-native: Added virtual/java-native to DEPENDS.

---
 packages/ecj/ecj-bootstrap-native.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/ecj/ecj-bootstrap-native.bb b/packages/ecj/ecj-bootstrap-native.bb
index 04f8ba4062..2bda972207 100644
--- a/packages/ecj/ecj-bootstrap-native.bb
+++ b/packages/ecj/ecj-bootstrap-native.bb
@@ -9,7 +9,7 @@ SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "EPL"
 
-DEPENDS = "libecj-bootstrap"
+DEPENDS = "libecj-bootstrap virtual/java-native"
 
 PROVIDES = "virtual/javac-native"
 
@@ -17,6 +17,8 @@ SRC_URI = "file://ecj.in"
 
 S = "${WORKDIR}"
 
+PR = "r1"
+
 JAR = "ecj-bootstrap.jar"
 
 inherit native
-- 
cgit v1.2.3


From cc25c30cd5285bda5f6043e6f27fa819498c6a0b Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@gmx.net>
Date: Fri, 3 Oct 2008 00:42:55 +0000
Subject: jamvm-native: Depend on ecj-initial (instead of
 virtual/javac-native), provide virtual/java-native.

---
 packages/jamvm/jamvm-native.inc      | 8 ++++++--
 packages/jamvm/jamvm-native_1.5.1.bb | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/jamvm/jamvm-native.inc b/packages/jamvm/jamvm-native.inc
index fc9023a62c..c3e4f84a60 100644
--- 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 e174e2a312..3b42dbbef6 100644
--- 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"
 
-- 
cgit v1.2.3