classpath-gtk: Use virtual/javac-native.

classpath-minimal: Use virtual/javac-native.

diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
index 18d79decae7e6348392bd5f59ef33b88e720e988..4d4895a319adac13381a6f62bcea6ab1447e936a 100644 (file)
--- a/packages/classpath/classpath-gtk_cvs.bb
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -6,7 +6,7 @@ SRCDATE_${PN} ?= "20070501"
 PV = "0.93+cvs${SRCDATE}"
 
 ### note from Laibsch: bug 2523 has information on how to build this package
-DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native libxtst"
+DEPENDS = "glib-2.0 gtk+ cairo gconf virtual/javac-native zip-native virtual/java-native libxtst"
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
@@ -15,7 +15,7 @@ SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpa
 
 S = "${WORKDIR}/classpath"
 
-EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa"
+EXTRA_OECONF = "--with-javac=${STAGING_BINDIR_NATIVE}/javac --with-ecj-jar=${STAGING_DATADIR_NATIVE}/ecj-bootstrap.jar --disable-plugin --disable-dssi --disable-alsa"
 
 do_stage() {
        install -d ${STAGING_INCDIR}/classpath

diff --git a/packages/classpath/classpath-minimal_0.95.bb b/packages/classpath/classpath-minimal_0.95.bb
index bca7a469197f1b67de06ed2f0e0ff9ba18ec2850..cb38710ac19f15d082b4817ed7883c435d826562 100644 (file)
--- a/packages/classpath/classpath-minimal_0.95.bb
+++ b/packages/classpath/classpath-minimal_0.95.bb
@@ -11,13 +11,13 @@ S = "${WORKDIR}/classpath-${PV}"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
 
-DEPENDS = "ecj-native zip-native"
+DEPENDS = "virtual/javac-native zip-native"
 
 inherit autotools
 
 
 EXTRA_OECONF = "--with-glibj \
-                --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \
+                --with-javac=${STAGING_BINDIR_NATIVE}/javac \
                 --disable-alsa \
                 --disable-gconf-peer \
                 --disable-gtk-peer \