diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-01-14 07:43:04 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-01-14 07:43:04 +0000 |
| commit | 4ff3a53c2fa48c87ecdef72a56811ad29ce79aba (patch) | |
| tree | b8c1eb6d4cdc1e18dd48f40c4ebc9f389fad5cc0 /packages | |
| parent | 7cd5599e9fe9274020dce2402c153f9b356dde24 (diff) | |
| parent | 7a12535e7256a91cba8b7bd5aea86963ad144a96 (diff) | |
merge of '7689fff9e1ccd863bef2d39ffbdb4808f5fe25f4'
and 'f69d33ca84f78b23a444272f70d92f9de97b221f'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/classpath/classpath-gtk_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/classpath/classpath-minimal_0.95.bb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb index 18d79decae..4d4895a319 100644 --- 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 bca7a46919..cb38710ac1 100644 --- 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 \ |