diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-06-26 23:33:51 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-06-26 23:33:51 +0000 |
| commit | 250a3f6612d300dac5cf53aaad7d4d08eb8d3414 (patch) | |
| tree | f5ca173386a9faf393bb5a7c1b05f58b6d9fab91 /packages/cacao/cacao.inc | |
| parent | 1bebab340e7ef2b326ca7dcfda17854cc20b8f20 (diff) | |
cacao: Cleanup and new recipe.
* removed the need for the 'libdir' patches and simplified cacao.inc
* removed those patches
* added with-build-java-library-classes patch (applied upstream already)
cacao 0.98+hg20080519: Simplified.
* adjusted with-build-java-library-classes patch for this version
* increased PR
cacao 0.99.1: New recipe.
Diffstat (limited to 'packages/cacao/cacao.inc')
| -rw-r--r-- | packages/cacao/cacao.inc | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc index 0d2b4c7ae1..e08cd5ec80 100644 --- a/packages/cacao/cacao.inc +++ b/packages/cacao/cacao.inc @@ -15,17 +15,33 @@ RPROVIDES_cacao = "java2-runtime" inherit java autotools update-alternatives +# Old and new options do not interfere. EXTRA_OECONF = "\ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ --enable-debug \ + --with-vm-zip=${datadir}/cacao/vm.zip \ --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \ + ${OLD_CACAO_OECONF} \ + ${NEW_CACAO_OECONF} \ + " + +# Options needed for Cacao < 0.99 (including hg snapshots) +OLD_CACAO_OECONF = "\ --with-classpath-includedir=${STAGING_INCDIR}/classpath \ --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \ --with-target-classpath-classes=${datadir}/classpath/glibj.zip \ - --with-vm-zip=${datadir}/cacao/vm.zip \ - --with-classpath-libdir=${libdir} \ + --with-classpath-libdir=${libdir_jni}:${libdir} \ " +# Options needed for Cacao >= 0.99 +NEW_CACAO_OECONF = "\ + --with-build-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \ + --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ + --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \ + --with-jni_md_h=${STAGING_INCDIR}/classpath \ + --with-jni_h=${STAGING_INCDIR}/classpath \ + " + PACKAGES = "${PN} ${PN}-doc ${PN}-dbg" FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}" @@ -36,16 +52,3 @@ ALTERNATIVE_NAME = "java" ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}" ALTERNATIVE_PATH = "${bindir}/cacao" ALTERNATIVE_PRIORITY = "10" - -do_configure_prepend() { - # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory - # configured in OE. - if [ -e src/vm/properties.c ]; then - sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/vm/properties.c - fi - - if [ -e src/vm/properties.c ]; then - sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/vm/vm.c - fi -} - |