diff options
Diffstat (limited to 'recipes/cacao/cacao.inc')
| -rw-r--r-- | recipes/cacao/cacao.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/recipes/cacao/cacao.inc b/recipes/cacao/cacao.inc index c22bbffd50..c366b7486a 100644 --- a/recipes/cacao/cacao.inc +++ b/recipes/cacao/cacao.inc @@ -8,7 +8,7 @@ DEPENDS = "zlib libtool classpath cacaoh-native virtual/javac-native" # Avoid version number here, otherwise dpkg will expect a package name # and cannot be satisfied with a package that provides classpath. -RDEPENDS = "classpath" +RDEPENDS_${PN} = "classpath" RPROVIDES_cacao = "java2-runtime" @@ -16,6 +16,8 @@ inherit java autotools update-alternatives ARM_INSTRUCTION_SET = "arm" +PRIVATE_LIBS = "libjvm.so" + # Configure options compatible with Cacao >= 0.99 only! EXTRA_OECONF = "\ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ @@ -27,11 +29,12 @@ EXTRA_OECONF = "\ --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \ --with-jni_md_h=${STAGING_INCDIR}/classpath \ --with-jni_h=${STAGING_INCDIR}/classpath \ - " + --libdir=${libdir}/cacao \ +" PACKAGES = "${PN} ${PN}-doc ${PN}-dbg" -FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}" +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*" |