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

diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index 3ea8bd6..db913ae 100644 (file)
--- 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 e69de29..1a268dd 100644 (file)
--- 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 0eeed7f..8108e96 100644 (file)
--- 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 \