diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-06-27 16:05:50 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-06-27 16:05:50 +0000 |
| commit | 882473c9913cf09da1f8e89738cb859e1e8bd882 (patch) | |
| tree | 818e039de162dcbc73f7826c28687132055dc561 /packages | |
| parent | 31c3d2f534c933df59abd3f594d177b781e549ba (diff) | |
| parent | f3b6b70f150b257afef3d025c1ed86b9270966b3 (diff) | |
merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
and '77f81ea18669b5c79145faa5f0a96df1d7db3232'
Diffstat (limited to 'packages')
113 files changed, 1884 insertions, 1198 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 -} - diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb index 878827c28e..e897cfad41 100644 --- a/packages/cacao/cacao_0.98+hg20071001.bb +++ b/packages/cacao/cacao_0.98+hg20071001.bb @@ -1,10 +1,9 @@ require cacao.inc -PR = "r8" +PR = "r9" SRC_URI = "\ http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \ - file://cacao-0.98+svn-libdir.diff;patch=1 \ file://cacao-0.98+svn-classpath_var.patch;patch=1 \ file://cacao-0.98+hg-arm-cacheflush-fix.patch;patch=1 \ file://cacao-0.98+hg-attachthread.patch;patch=1 \ diff --git a/packages/cacao/cacao_0.98+hg20080519.bb b/packages/cacao/cacao_0.98+hg20080519.bb index efe0fbb898..0cd5132ef7 100644 --- a/packages/cacao/cacao_0.98+hg20080519.bb +++ b/packages/cacao/cacao_0.98+hg20080519.bb @@ -1,24 +1,12 @@ require cacao.inc -PR = "r0" +PR = "r1" -SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \ - file://cacao-hg20080519-classpath_var.patch;patch=1 \ - file://cacao-hg20080519-libdir.patch;patch=1 \ - " +SRC_URI = "\ + http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \ + file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \ + " S = "${WORKDIR}/cacao" -EXTRA_OECONF = "\ - ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) = |