aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Heinold <henning@itconsulting-heinold.de>2014-03-05 06:13:03 +0100
committerHenning Heinold <henning@itconsulting-heinold.de>2014-03-05 22:41:34 +0100
commit967975bbceaa6cd47862c23de0fb2d3f3d439f3e (patch)
treeda710ba23f81111388473948c578837764e58260
parent6c01d9fa201b5578d64650c0fdab1c13a82a0c42 (diff)
downloadmeta-java-967975bbceaa6cd47862c23de0fb2d3f3d439f3e.tar.gz
meta-java-967975bbceaa6cd47862c23de0fb2d3f3d439f3e.tar.bz2
meta-java-967975bbceaa6cd47862c23de0fb2d3f3d439f3e.zip
cacao: fix target compilation and packaging
-rw-r--r--recipes-core/cacao/cacao_1.6.1.bb27
1 files changed, 22 insertions, 5 deletions
diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-core/cacao/cacao_1.6.1.bb
index 006ee02..4ad81db 100644
--- a/recipes-core/cacao/cacao_1.6.1.bb
+++ b/recipes-core/cacao/cacao_1.6.1.bb
@@ -15,8 +15,8 @@ SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-
SRC_URI[md5sum] = "2c18478404afd1cffdd15ad1e9d85a57"
SRC_URI[sha256sum] = "eecc8bd1b528a028f43d9d1d0c06b97855bbf1d40e03826d911ebbc0b6971e12"
-inherit java autotools update-alternatives
-# --with-vm-zip=${datadir}/cacao/vm.zip
+inherit java autotools update-alternatives pkgconfig
+
EXTRA_OECONF_class-native = "\
--enable-debug \
--with-vm-zip=${datadir}/cacao/vm.zip \
@@ -35,14 +35,31 @@ EXTRA_OECONF_class-native = "\
CACHED_CONFIGUREVARS_class-native += "ac_cv_prog_JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial"
+EXTRA_OECONF = "\
+ --with-vm-zip=${datadir}/cacao/vm.zip \
+ --disable-libjvm \
+ \
+ --with-build-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+ --with-jni_h=${STAGING_INCDIR}/classpath \
+ --with-jni_md_h=${STAGING_INCDIR}/classpath \
+ \
+ --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
+ --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \
+ --disable-test-dependency-checks \
+"
+
do_configure_prepend () {
rm src/mm/boehm-gc/ltmain.sh
mkdir -p src/mm/boehm-gc/m4
}
-#FILES_${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}"
-#FILES_${PN}-doc = "${datadir}/man"
-#FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*"
+do_install_append () {
+ rm ${D}/${bindir}/java
+}
+
+FILES_${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}"
+FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*"
+FILES_${PN}-doc += "${datadir}/gc"
ALTERNATIVE_NAME = "java"
ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"