summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/kaffe/kaffe-gtk_cvs.bb6
-rw-r--r--packages/kaffe/kaffe-qt_cvs.bb7
-rw-r--r--packages/kaffe/kaffe.inc14
-rw-r--r--packages/kaffe/kaffeh-native_cvs.bb6
4 files changed, 25 insertions, 8 deletions
diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb
index 84d80dbb1c..c4e321fc6c 100644
--- a/packages/kaffe/kaffe-gtk_cvs.bb
+++ b/packages/kaffe/kaffe-gtk_cvs.bb
@@ -1,6 +1,10 @@
-include kaffe.inc
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+
PV = "1.1.4+cvs${CVSDATE}"
+SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
+S = "${WORKDIR}/kaffe"
+
+include kaffe.inc
DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib kaffeh-native"
diff --git a/packages/kaffe/kaffe-qt_cvs.bb b/packages/kaffe/kaffe-qt_cvs.bb
index 9b7e5b2d55..06fbf68b90 100644
--- a/packages/kaffe/kaffe-qt_cvs.bb
+++ b/packages/kaffe/kaffe-qt_cvs.bb
@@ -1,6 +1,11 @@
-include kaffe.inc
+BROKEN = "1"
PV = "1.1.4+cvs${CVSDATE}"
+SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
+S = "${WORKDIR}/kaffe"
+
+include kaffe.inc
+
DEPENDS += "libqpe-opie"
CXXFLAGS += " -DQPE "
diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index 48023d4f9f..3ea8bd68e7 100644
--- a/packages/kaffe/kaffe.inc
+++ b/packages/kaffe/kaffe.inc
@@ -4,19 +4,20 @@ LICENSE = "GPL LGPL W3C Classpath BSD"
DEPENDS = "jikes-native fastjar-native"
-SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe \
- file://disable-automake-checks.patch;patch=1"
-S = "${WORKDIR}/kaffe"
+SRC_URI += "file://disable-automake-checks.patch;patch=1"
inherit autotools gettext
-EXTRA_OECONF = "--with-engine=jit \
+EXTRA_OECONF = "--with-engine=intrp \
+ --with-libffi \
--with-threads=unix-pthreads \
--disable-alsatest \
--disable-esdtest \
--disable-sound \
--with-jikes"
+CFLAGS += "-D_GNU_SOURCE"
+
# kaffe installs to non-standard locations. apply a similar workaround to
# the one used in debian. i.e. override prefix
oe_runconf () {
@@ -41,7 +42,11 @@ oe_runconf () {
oefatal "no configure script found"
fi
}
+
+PACKAGES =+ "${PN}-common"
FILES_${PN} += "${libdir}/${PN}"
+RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
+FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar"
do_install () {
autotools_do_install
@@ -49,6 +54,7 @@ do_install () {
# move partially duplicate stuff to a single location
mv -f ${D}${libdir}/${PN}/bin/* ${D}${libdir}/${PN}/jre/bin
rmdir ${D}${libdir}/${PN}/bin
+ cd ${D}${libdir}/${PN} && ln -s jre/bin
}
# use update-alternatives for the various wrapper scripts
diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb
index f5bca088eb..5c2d7c1907 100644
--- a/packages/kaffe/kaffeh-native_cvs.bb
+++ b/packages/kaffe/kaffeh-native_cvs.bb
@@ -1,6 +1,8 @@
-include kaffe.inc
-
PV = "1.1.4+cvs${CVSDATE}"
+SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
+S = "${WORKDIR}/kaffe"
+
+include kaffe.inc
inherit native