From d999cab16801368e0132e7fc575e78d9a2b7df25 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net> Date: Sat, 4 Jun 2005 15:40:09 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/04 17:00:32+02:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/06/04 16:58:31+02:00 dyndns.org!reenoo kaffe: - kaffeh-native: override EXTRA_OECONF instead of appending to it - kaffe.inc: add libffi to DEPENDS BKrev: 42a1cb59goK9VqYKSOwO2RG32F6GVg --- packages/kaffe/kaffe.inc | 2 +- packages/kaffe/kaffeh-native_1.1.5.bb | 22 ++++++++++++++++++++++ packages/kaffe/kaffeh-native_cvs.bb | 6 +++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc index 3ea8bd68e7..db913aee51 100644 --- a/packages/kaffe/kaffe.inc +++ b/packages/kaffe/kaffe.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Kaffe is a clean room implementation of the Java Virtual Machine" HOMEPAGE = "http://www.kaffe.org/" LICENSE = "GPL LGPL W3C Classpath BSD" -DEPENDS = "jikes-native fastjar-native" +DEPENDS = "jikes-native fastjar-native libffi" SRC_URI += "file://disable-automake-checks.patch;patch=1" diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb index e69de29bb2..1a268dddbb 100644 --- a/packages/kaffe/kaffeh-native_1.1.5.bb +++ b/packages/kaffe/kaffeh-native_1.1.5.bb @@ -0,0 +1,22 @@ +SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz" +S = "${WORKDIR}/kaffe-${PV}" + +include kaffe.inc + +inherit native + +EXTRA_OECONF = "--disable-alsatest \ + --disable-esdtest \ + --disable-sound \ + --with-jikes \ + --without-classpath-gtk-awt \ + --disable-native-awt \ + --disable-sound \ + --without-x \ + --without-kaffe-x-awt \ + --disable-debug \ + --disable-gcj" + +do_stage() { + install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/ +} diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb index 0eeed7f912..8108e9615d 100644 --- a/packages/kaffe/kaffeh-native_cvs.bb +++ b/packages/kaffe/kaffeh-native_cvs.bb @@ -8,7 +8,11 @@ include kaffe.inc inherit native -EXTRA_OECONF += " --without-classpath-gtk-awt \ +EXTRA_OECONF = "--disable-alsatest \ + --disable-esdtest \ + --disable-sound \ + --with-jikes \ + --without-classpath-gtk-awt \ --disable-native-awt \ --disable-sound \ --without-x \ -- cgit v1.2.3