cacao-native 0.98+hg20071001: Removed (use 0.99.3 instead).
cacao:
* simplified cacao.inc
* removed 0.98+hg20071001 and 0.98+hg20080519
* removed patches
cacaoh-native:
* simplified cacaoh-native.inc
* removed 0.98+hg20071001 and 0.98+hg20080519
+++ /dev/null
-require cacao-native.inc
-
-PR = "r1"
-
-SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
-
-# force usage of ecj-initial (but Java5-compatible class library)
-export JAVAC = "${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
-
inherit java autotools update-alternatives
-# Old and new options do not interfere.
+# Configure options compatible with Cacao >= 0.99 only!
EXTRA_OECONF = "\
${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
--enable-debug \
+ --enable-disassembler \
--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-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 \
+ --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"
+++ /dev/null
-require cacao.inc
-
-PR = "r11"
-
-SRC_URI = "\
- http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \
- 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 \
- "
-
-EXTRA_OECONF += "\
- --enable-annotations \
- "
-
-# 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"
+++ /dev/null
-require cacao.inc
-
-PR = "r3"
-
-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"
-
-DEFAULT_PREFERENCE = "-1"
require cacao.inc
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
file://cacao-codegen-arm1.patch;patch=1 \
file://cacao-arm-race.patch;patch=1 \
file://vfp-compat.patch;patch=1 \
"
-
-EXTRA_OECONF += "--enable-disassembler"
inherit autotools native
EXTRA_OECONF = " \
- --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 \
+++ /dev/null
-require cacaoh-native.inc
-
-PR = "r1"
-
-SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
-
-
+++ /dev/null
-require cacaoh-native.inc
-
-PR = "r1"
-
-SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f"
-
-S = "${WORKDIR}/cacao"
-
-DEFAULT_PREFERENCE = "-1"
require cacaoh-native.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
+++ /dev/null
-diff -r df1b780317c3 src/vm/jit/arm/asmpart.S
---- a/src/vm/jit/arm/asmpart.S Thu Jan 17 01:01:35 2008 +0100
-+++ b/src/vm/jit/arm/asmpart.S Mon Jan 21 00:14:41 2008 +0100
-@@ -323,10 +323,11 @@ asm_cacheflush:
- mov a1, #0xff000000
- #endif
-
-+#if defined(__ARM_EABI__)
-+ swi 0x0
-+ ldmfd sp!, {r7}
-+#else
- swi sys_cacheflush
--
--#if defined(__ARM_EABI__)
-- ldmfd sp!, {r7}
- #endif
-
- mov pc, lr
+++ /dev/null
-Index: cacao-0.98+hg7750/src/vm/jit/arm/asmpart.S
-===================================================================
---- cacao-0.98+hg7750.orig/src/vm/jit/arm/asmpart.S 2007-11-28 10:14:51.000000000 +0100
-+++ cacao-0.98+hg7750/src/vm/jit/arm/asmpart.S 2007-11-28 10:15:31.000000000 +0100
-@@ -302,35 +302,21 @@
- * *
- *******************************************************************************/
-
--.equ sys_cacheflush,__ARM_NR_cacheflush /* syscall number for cache flushing */
--
-+.equ sys_cacheflush, 0x9f0002
- asm_cacheflush:
-- add a1, a0, a1
-- mov a2, #0
--
--#if defined(__ARM_EABI__)
-- /* According to EABI, the syscall number should be passed via R7,
-- see "http://wiki.debian.org/ArmEabiPort" for additional details. */
--
-- stmfd sp!, {r7}
-- mov r7, #0x0f0000
-- add r7, r7, #0x000002
--#endif
-+ add a1, a0, a1
-+ mov a2, #0
-
- #if 0
-- /* TWISTI: required on iyonix, maybe a linux-2.4 bug */
-- mov a0, #0x0
-- mov a1, #0xff000000
-+ /* TWISTI: required on iyonix, maybe a linux-2.4 bug */
-+ /* TODO: repeair this! */
-+ /* cacheflush is messed up beyond all repair! */
-+ mov a0, #0x0
-+ mov a1, #0xff000000
- #endif
-
-- swi sys_cacheflush
--
--#if defined(__ARM_EABI__)
-- ldmfd sp!, {r7}
--#endif
--
-- mov pc, lr
--
-+ swi #sys_cacheflush
-+ mov pc, lr
-
- /* disable exec-stacks ********************************************************/
-
+++ /dev/null
-# Makes the JNI function AttachCurrentThread work properly.
-
-Index: cacao-0.98+hg20071001/src/mm/boehm-gc/include/gc.h
-===================================================================
---- cacao-0.98+hg20071001.orig/src/mm/boehm-gc/include/gc.h 2008-01-15 14:45:41.000000000 +0100
-+++ cacao-0.98+hg20071001/src/mm/boehm-gc/include/gc.h 2008-01-15 14:46:30.000000000 +0100
-@@ -905,6 +905,8 @@
- /* in returned list. */
- extern void GC_thr_init GC_PROTO((void));/* Needed for Solaris/X86 */
-
-+extern void GC_thr_init_foreign GC_PROTO((void));/* Needed for Solaris/X86 */
-+
- #endif /* THREADS && !SRC_M3 */
-
- #if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
-Index: cacao-0.98+hg20071001/src/mm/boehm-gc/pthread_support.c
-===================================================================
---- cacao-0.98+hg20071001.orig/src/mm/boehm-gc/pthread_support.c 2008-01-15 14:45:41.000000000 +0100
-+++ cacao-0.98+hg20071001/src/mm/boehm-gc/pthread_support.c 2008-01-15 14:46:30.000000000 +0100
-@@ -864,6 +864,27 @@
- }
- #endif /* GC_NETBSD_THREADS */
-
-+void GC_thr_init_foreign()
-+{
-+# ifndef GC_DARWIN_THREADS
-+ int dummy;
-+# endif
-+ GC_thread t;
-+ LOCK();
-+
-+ /* Add the initial thread, so we can stop it. */
-+ t = GC_new_thread(pthread_self());
-+# ifdef GC_DARWIN_THREADS
-+ t -> stop_info.mach_thread = mach_thread_self();
-+# else
-+ t -> stop_info.stack_ptr = (ptr_t)(&dummy);
-+# endif
-+ t -> flags = DETACHED;
-+
-+ UNLOCK();
-+
-+}
-+
- /* We hold the allocation lock. */
- void GC_thr_init()
- {
-Index: cacao-0.98+hg20071001/src/mm/boehm.c
-===================================================================
---- cacao-0.98+hg20071001.orig/src/mm/boehm.c 2008-01-15 14:45:41.000000000 +0100
-+++ cacao-0.98+hg20071001/src/mm/boehm.c 2008-01-15 14:46:30.000000000 +0100
-@@ -108,6 +108,10 @@
- GC_expand_hp(heapstartsize - heapcurrentsize);
- }
-
-+void gc_init_foreign()
-+{
-+ GC_thr_init_foreign();
-+}
-
- static void gc_ignore_warnings(char *msg, GC_word arg)
- {
-Index: cacao-0.98+hg20071001/src/mm/gc-common.h
-===================================================================
---- cacao-0.98+hg20071001.orig/src/mm/gc-common.h 2008-01-15 14:45:41.000000000 +0100
-+++ cacao-0.98+hg20071001/src/mm/gc-common.h 2008-01-15 14:46:30.000000000 +0100
-@@ -74,6 +74,7 @@
- void gc_finalize_all(void);
- void *gc_out_of_memory(size_t bytes_requested);
-
-+void gc_init_foreign();
-
- /* inlined functions **********************************************************/
-
-Index: cacao-0.98+hg20071001/src/threads/native/threads.c
-===================================================================
---- cacao-0.98+hg20071001.orig/src/threads/native/threads.c 2008-01-15 14:45:41.000000000 +0100
-+++ cacao-0.98+hg20071001/src/threads/native/threads.c 2008-01-15 16:01:22.000000000 +0100
-@@ -1392,7 +1392,10 @@
-
- /* thread is completely initialized */
-
-+ gc_init_foreign();
-+
- threads_thread_state_runnable(thread);
-+ threads_set_current_threadobject(thread);
-
- DEBUGTHREADS("attaching", thread);
-
+++ /dev/null
-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)
git.openpandora.org / openembedded.git / commitdiff