cacao 0.98+hg20071001: Added snapshot version.

cacao-cldc: Added an include recipe.
classpath: Moved versions prior 0.95 to obsolete/ .
classpath-minimal: Moved versions prior 0.95 to obsolete/ .
classpath-gtk: Moved to obsolete/.
classpath cvs: Moved to obsolete/.
classpath 0.96.1: Added new version.
classpath 0.95: Added new version.
classpath-minimal 0.96.1: Added new version.
midpath-cldc: Removed notion of virtual/cldc-api-1.1
  - install cldc1.1.jar as midpath-cldc1.1.jar to ${datadir}/midpath-cldc

4 files changed, 148 insertions, 0 deletions

diff --git a/packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch b/packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
new file mode 100644
index 0000000000..813cb683f6
--- /dev/null
+++ b/packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
@@ -0,0 +1,50 @@
+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 ********************************************************/
+ 
diff --git a/packages/cacao/files/cacao-0.98+hg-attachthread.patch b/packages/cacao/files/cacao-0.98+hg-attachthread.patch
new file mode 100644
index 0000000000..b3dfabc625
--- /dev/null
+++ b/packages/cacao/files/cacao-0.98+hg-attachthread.patch
@@ -0,0 +1,12 @@
+diff -r d8fe2c3ba284 src/threads/native/threads.c
+--- a/src/threads/native/threads.c	Sun Dec 30 17:43:35 2007 +0100
++++ b/src/threads/native/threads.c	Wed Jan 02 16:41:57 2008 +0100
+@@ -1432,6 +1432,8 @@ bool threads_attach_current_thread(JavaV
+ 
+ 	threads_thread_set_object(thread, (java_handle_t *) t);
+ 
++  threads_set_current_threadobject(thread);
++
+ 	/* thread is completely initialized */
+ 
+ 	threads_thread_state_runnable(thread);
diff --git a/packages/cacao/files/cacao-0.98+svn-classpath_var.patch b/packages/cacao/files/cacao-0.98+svn-classpath_var.patch
new file mode 100644
index 0000000000..255281d386
--- /dev/null
+++ b/packages/cacao/files/cacao-0.98+svn-classpath_var.patch
@@ -0,0 +1,56 @@
+Index: cacao-trunk/src/vm/properties.c
+===================================================================
+--- cacao-trunk.orig/src/vm/properties.c	2007-08-31 13:28:53.000000000 +0200
++++ cacao-trunk/src/vm/properties.c	2007-09-03 00:36:14.000000000 +0200
+@@ -294,14 +294,14 @@
+ 		len =
+ 			strlen(CACAO_VM_ZIP) +
+ 			strlen(":") +
+-			strlen(CLASSPATH_CLASSES) +
++			strlen(TARGET_CLASSPATH_CLASSES) +
+ 			strlen("0");
+ 
+ 		boot_class_path = MNEW(char, len);
+ 
+ 		strcpy(boot_class_path, CACAO_VM_ZIP);
+ 		strcat(boot_class_path, ":");
+-		strcat(boot_class_path, CLASSPATH_CLASSES);
++		strcat(boot_class_path, TARGET_CLASSPATH_CLASSES);
+ 
+ # elif defined(WITH_CLASSPATH_SUN)
+ 
+Index: cacao-trunk/configure.ac
+===================================================================
+--- cacao-trunk.orig/configure.ac	2007-08-31 13:22:03.000000000 +0200
++++ cacao-trunk/configure.ac	2007-08-31 13:30:44.000000000 +0200
+@@ -851,6 +851,7 @@
+ AC_CHECK_WITH_CLASSPATH
+ AC_CHECK_WITH_CLASSPATH_PREFIX
+ AC_CHECK_WITH_CLASSPATH_CLASSES
++AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES
+ AC_CHECK_WITH_CLASSPATH_LIBDIR
+ AC_CHECK_WITH_CLASSPATH_INCLUDEDIR
+ 
+Index: cacao-trunk/m4/classpath.m4
+===================================================================
+--- cacao-trunk.orig/m4/classpath.m4	2007-08-31 13:22:21.000000000 +0200
++++ cacao-trunk/m4/classpath.m4	2007-08-31 13:30:55.000000000 +0200
+@@ -98,6 +98,18 @@
+ AC_SUBST(CLASSPATH_CLASSES)
+ ])
+ 
++dnl where are Java core library classes installed on the target
++
++AC_DEFUN([AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES],[
++AC_MSG_CHECKING(where Java core library classes are installed on the target)
++AC_ARG_WITH([target-classpath-classes],
++            [AS_HELP_STRING(--with-target-classpath-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=/usr/local/classpath/share/classpath/glibj.zip]])],
++            [TARGET_CLASSPATH_CLASSES=${withval}],
++            [TARGET_CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip])
++AC_MSG_RESULT(${TARGET_CLASSPATH_CLASSES})
++AC_DEFINE_UNQUOTED([TARGET_CLASSPATH_CLASSES], "${TARGET_CLASSPATH_CLASSES}", [Java core library classes on the target])
++AC_SUBST(TARGET_CLASSPATH_CLASSES)
++])
+ 
+ dnl where are Java core library native libraries installed
+ 
diff --git a/packages/cacao/files/cacao-0.98+svn-libdir.diff b/packages/cacao/files/cacao-0.98+svn-libdir.diff
new file mode 100644
index 0000000000..f5cf9ba5a1
--- /dev/null
+++ b/packages/cacao/files/cacao-0.98+svn-libdir.diff
@@ -0,0 +1,30 @@
+Index: cacao-trunk/src/vm/properties.c
+===================================================================
+--- cacao-trunk.orig/src/vm/properties.c	2007-08-31 13:20:41.000000000 +0200
++++ cacao-trunk/src/vm/properties.c	2007-09-04 14:54:19.000000000 +0200
+@@ -210,15 +210,22 @@
+ 
+ # if defined(WITH_CLASSPATH_GNU)
+ 
+-	boot_library_path = CLASSPATH_LIBDIR"/classpath";
++	boot_library_path = CLASSPATH_LIBDIR"/classpath:OE_LIBDIR_JNI";
+ 
+ # elif defined(WITH_CLASSPATH_SUN)
+ 
+-	boot_library_path = CLASSPATH_LIBDIR;
++	boot_library_path = CLASSPATH_LIBDIR":OE_LIBDIR_JNI";
+ 
+ # elif defined(WITH_CLASSPATH_CLDC1_1)
+ 
+-	/* No boot_library_path required. */
++	/* No boot_library_path required.
++           Well, don't be that strict on Debian-like
++           environments. Setting this to /usr/lib/jni
++           makes it unneccessary to fumble with
++           LD_LIBRARY_PATH to get things like MIDPath
++           running.
++        */
++	boot_library_path = "OE_LIBDIR_JNI";
+ 
+ # else
+ #  error unknown classpath configuration