[oe-commits] org.oe.dev Add a new cacao revision and add support for changed configure options (new in 0.99)
thebohemian commit
oe at amethyst.openembedded.net
Thu Jun 26 23:57:35 UTC 2008
Add a new cacao revision and add support for changed configure options (new in 0.99)
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)
* usage of changed configure options
cacao 0.98+hg20080519: Simplified.
* adjusted with-build-java-library-classes patch for this version
* increased PR
cacao 0.99.1: New recipe.
cacaoh-native:
* usage of changed configure options
cacaoh-native 0.98+hg20080519: Simplified.
cacaoh-native 0.99.1: New recipe.
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 3ff73a63024dbf38522e7a189339904702a9124a
ViewMTN: http://monotone.openembedded.org/revision/info/3ff73a63024dbf38522e7a189339904702a9124a
Files:
1
packages/cacao/files/cacao-0.98+svn-libdir.diff
packages/cacao/files/cacao-hg20080519-classpath_var.patch
packages/cacao/files/cacao-hg20080519-libdir.patch
packages/cacao/cacao_0.99.1.bb
packages/cacao/cacaoh-native_0.99.1.bb
packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch
packages/cacao/cacao.inc
packages/cacao/cacao_0.98+hg20071001.bb
packages/cacao/cacao_0.98+hg20080519.bb
packages/cacao/cacaoh-native.inc
packages/cacao/cacaoh-native_0.98+hg20071001.bb
packages/cacao/cacaoh-native_0.98+hg20080519.bb
Diffs:
#
# mt diff -r712c277589bb760f0e4a027003fe203e9db758d7 -r3ff73a63024dbf38522e7a189339904702a9124a
#
#
#
# delete "packages/cacao/files/cacao-0.98+svn-libdir.diff"
#
# delete "packages/cacao/files/cacao-hg20080519-classpath_var.patch"
#
# delete "packages/cacao/files/cacao-hg20080519-libdir.patch"
#
# add_file "packages/cacao/cacao_0.99.1.bb"
# content [77d2dd2b46672fce71c875cb18b3294166d240cd]
#
# add_file "packages/cacao/cacaoh-native_0.99.1.bb"
# content [735253ea956ccb78193fc733b23b31a5a1165186]
#
# add_file "packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch"
# content [38f9accf44f56287f7683e372455f44dfe294539]
#
# patch "packages/cacao/cacao.inc"
# from [d1fb162242cfc59d0aecad7027643cdec90b4b4d]
# to [44ce965971f392ff3be288e7b9b3f44fd01a5c69]
#
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
# from [ac5e51b47c7d3446078d237ac95abd0fa9c668cc]
# to [9bdf5633757ed3e83764bf8121e01f802736554c]
#
# patch "packages/cacao/cacao_0.98+hg20080519.bb"
# from [a332104661010fe20cb8578a21fb16b673c5c620]
# to [fa6b0f11ad259a1b9380f5c77debc6c109d15a06]
#
# patch "packages/cacao/cacaoh-native.inc"
# from [21cb933b74df6d2ac41c9593d5df8f193f74b51a]
# to [06a21012229abcbca5aa890afb2b237bc77937e1]
#
# patch "packages/cacao/cacaoh-native_0.98+hg20071001.bb"
# from [3e9914f2a492d38de75e478cba4c16addca80a06]
# to [e9242a3e16739aaaeb267e1ab74325bde03eb70c]
#
# patch "packages/cacao/cacaoh-native_0.98+hg20080519.bb"
# from [887b06266366e3ca536ec57e0200f64db2cf6e0f]
# to [c0c91cc0955b5171cfbf9e995b61a14e9184a172]
#
============================================================
--- packages/cacao/cacao_0.99.1.bb 77d2dd2b46672fce71c875cb18b3294166d240cd
+++ packages/cacao/cacao_0.99.1.bb 77d2dd2b46672fce71c875cb18b3294166d240cd
@@ -0,0 +1,14 @@
+require cacao.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
+ file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
+ "
+
+# Quirks for Nokia N800:
+# - with mfloat-abi=softfp the runtime fails to run anything
+# - without --enable-softfloat it cannot find files within Jars
+TARGET_CC_ARCH_nokia800 = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=soft"
+
+EXTRA_OECONF_append_nokia800 = "--enable-softfloat"
============================================================
--- packages/cacao/cacaoh-native_0.99.1.bb 735253ea956ccb78193fc733b23b31a5a1165186
+++ packages/cacao/cacaoh-native_0.99.1.bb 735253ea956ccb78193fc733b23b31a5a1165186
@@ -0,0 +1,5 @@
+require cacaoh-native.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d"
============================================================
--- packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch 38f9accf44f56287f7683e372455f44dfe294539
+++ packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch 38f9accf44f56287f7683e372455f44dfe294539
@@ -0,0 +1,53 @@
+Index: cacao/configure.ac
+===================================================================
+--- cacao.orig/configure.ac 2008-06-27 01:23:44.000000000 +0200
++++ cacao/configure.ac 2008-06-27 01:24:02.000000000 +0200
+@@ -772,6 +772,7 @@
+
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
++AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES
+
+ if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
+Index: cacao/m4/java-runtime-library.m4
+===================================================================
+--- cacao.orig/m4/java-runtime-library.m4 2008-06-27 01:23:44.000000000 +0200
++++ cacao/m4/java-runtime-library.m4 2008-06-27 01:24:02.000000000 +0200
+@@ -93,20 +93,32 @@
+ AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes])
+ AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES)
+
++dnl where are Java core library classes located at compilation time
++
++AC_DEFUN([AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES],[
++AC_MSG_CHECKING(where Java core library classes are located at compile time)
++AC_ARG_WITH([build-java-runtime-library-classes],
++ [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]])],
++ [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
++ [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip])
++AC_MSG_RESULT(${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES})
++AC_DEFINE_UNQUOTED([BUILD_JAVA_RUNTIME_LIBRARY_CLASSES], "${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java core library classes at compile time])
++AC_SUBST(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)
++])
++
+ dnl define BOOTCLASSPATH for Makefiles
+ case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+ cldc1.1 | gnuclasspath)
+- BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
++ BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+ ;;
+ *)
+- BOOTCLASSPATH="\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
++ BOOTCLASSPATH="\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+ ;;
+ esac
+ AC_SUBST(BOOTCLASSPATH)
+ ])
+
+-
+-dnl where are Java runtime library native libraries installed
++dnl where are Java runtime library native libraries installed (at compilation time)
+
+ AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
+ AC_MSG_CHECKING(where Java runtime library native libraries are installed)
============================================================
--- packages/cacao/cacao.inc d1fb162242cfc59d0aecad7027643cdec90b4b4d
+++ packages/cacao/cacao.inc 44ce965971f392ff3be288e7b9b3f44fd01a5c69
@@ -15,17 +15,33 @@ inherit java autotools update-alternativ
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_PRIORITY = "10"
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
-}
-
============================================================
--- packages/cacao/cacao_0.98+hg20071001.bb ac5e51b47c7d3446078d237ac95abd0fa9c668cc
+++ packages/cacao/cacao_0.98+hg20071001.bb 9bdf5633757ed3e83764bf8121e01f802736554c
@@ -1,10 +1,9 @@ require cacao.inc
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 \
============================================================
--- packages/cacao/cacao_0.98+hg20080519.bb a332104661010fe20cb8578a21fb16b673c5c620
+++ packages/cacao/cacao_0.98+hg20080519.bb fa6b0f11ad259a1b9380f5c77debc6c109d15a06
@@ -1,24 +1,11 @@ require cacao.inc
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 \
+ 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) == 'soft']} \
- --enable-debug \
- --with-vm-zip=${datadir}/cacao/vm.zip \
- --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
- --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
- --with-target-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
- --with-java-runtime-library-libdir=${libdir} \
- --with-jni_md_h=${STAGING_INCDIR}/classpath \
- --with-jni_h=${STAGING_INCDIR}/classpath \
- "
-
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/cacao/cacaoh-native.inc 21cb933b74df6d2ac41c9593d5df8f193f74b51a
+++ packages/cacao/cacaoh-native.inc 06a21012229abcbca5aa890afb2b237bc77937e1
@@ -6,14 +6,16 @@ S = "${WORKDIR}/cacao-${PV}"
S = "${WORKDIR}/cacao-${PV}"
-PR = "r1"
-
inherit autotools native
EXTRA_OECONF = " \
- --with-classpath-includedir=${STAGING_INCDIR}/classpath \
- --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
- "
+ --with-classpath-includedir=${STAGING_INCDIR}/classpath \
+ --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+ \
+ --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+ --with-jni_md_h=${STAGING_INCDIR}/classpath \
+ --with-jni_h=${STAGING_INCDIR}/classpath \
+ "
do_compile() {
# Compile the header generator only (and what is needed for it).
============================================================
--- packages/cacao/cacaoh-native_0.98+hg20071001.bb 3e9914f2a492d38de75e478cba4c16addca80a06
+++ packages/cacao/cacaoh-native_0.98+hg20071001.bb e9242a3e16739aaaeb267e1ab74325bde03eb70c
@@ -1,5 +1,7 @@ require cacaoh-native.inc
require cacaoh-native.inc
+PR = "r1"
+
SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
============================================================
--- packages/cacao/cacaoh-native_0.98+hg20080519.bb 887b06266366e3ca536ec57e0200f64db2cf6e0f
+++ packages/cacao/cacaoh-native_0.98+hg20080519.bb c0c91cc0955b5171cfbf9e995b61a14e9184a172
@@ -1,15 +1,9 @@ require cacaoh-native.inc
require cacaoh-native.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f"
S = "${WORKDIR}/cacao"
-EXTRA_OECONF = " \
- --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
- --with-jni_md_h=${STAGING_INCDIR}/classpath \
- --with-jni_h=${STAGING_INCDIR}/classpath \
- "
-
DEFAULT_PREFERENCE = "-1"
More information about the Openembedded-commits
mailing list