diff options
Diffstat (limited to 'recipes/jamvm/files')
-rw-r--r-- | recipes/jamvm/files/debian-jni.patch | 19 | ||||
-rw-r--r-- | recipes/jamvm/files/jamvm-1.3.1-size-defaults.patch | 12 | ||||
-rw-r--r-- | recipes/jamvm/files/jamvm_1.4.5-initial.patch | 73 | ||||
-rw-r--r-- | recipes/jamvm/files/jamvm_1.5.0-initial.patch | 82 |
4 files changed, 186 insertions, 0 deletions
diff --git a/recipes/jamvm/files/debian-jni.patch b/recipes/jamvm/files/debian-jni.patch new file mode 100644 index 0000000000..040163da69 --- /dev/null +++ b/recipes/jamvm/files/debian-jni.patch @@ -0,0 +1,19 @@ +--- src/dll.c.orig 2004-09-09 15:48:45.000000000 +0000 ++++ src/dll.c 2004-09-09 15:50:32.000000000 +0000 +@@ -189,6 +189,16 @@ + #ifndef NO_JNI + /* Init hash table, and create lock */ + initHashTable(hash_table, HASHTABSZE, TRUE); ++ ++ /* XXX: Add Debian JNI directory. */ ++ char* path = getenv("LD_LIBRARY_PATH"); ++ ++ if (path != NULL) ++ path = strcat(path, ":OE_LIBDIR_JNI"); ++ else ++ path = "OE_LIBDIR_JNI"; ++ ++ setenv("LD_LIBRARY_PATH", path, 1); + #endif + } + diff --git a/recipes/jamvm/files/jamvm-1.3.1-size-defaults.patch b/recipes/jamvm/files/jamvm-1.3.1-size-defaults.patch new file mode 100644 index 0000000000..a41beee982 --- /dev/null +++ b/recipes/jamvm/files/jamvm-1.3.1-size-defaults.patch @@ -0,0 +1,12 @@ +--- jamvm-1.3.1.orig/src/jam.h 2005-07-17 23:53:34.000000000 +0200 ++++ jamvm-1.3.1/src/jam.h 2005-07-17 23:54:17.000000000 +0200 +@@ -548,7 +548,9 @@ + #endif + + /* default size of the Java stack */ ++#ifndef DEFAULT_STACK + #define DEFAULT_STACK 64*KB ++#endif + + /* size of emergency area - big enough to create + a StackOverflow exception */ diff --git a/recipes/jamvm/files/jamvm_1.4.5-initial.patch b/recipes/jamvm/files/jamvm_1.4.5-initial.patch new file mode 100644 index 0000000000..3c68818955 --- /dev/null +++ b/recipes/jamvm/files/jamvm_1.4.5-initial.patch @@ -0,0 +1,73 @@ +Index: jamvm-1.4.5/configure.ac +=================================================================== +--- jamvm-1.4.5.orig/configure.ac ++++ jamvm-1.4.5/configure.ac +@@ -1,6 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/jam.c) +-AM_INIT_AUTOMAKE(jamvm, 1.4.5) ++AM_INIT_AUTOMAKE(jamvm-initial, 1.4.5) + AC_CONFIG_HEADERS([src/config.h]) + AC_PREFIX_DEFAULT(/usr/local/jamvm) + +Index: jamvm-1.4.5/java-initial +=================================================================== +--- /dev/null ++++ jamvm-1.4.5/java-initial +@@ -0,0 +1,5 @@ ++#!/bin/sh ++# ++# Wrapper script inspired by the one provided by cacao. ++ ++exec jamvm-initial ${1+"$@"} +Index: jamvm-1.4.5/lib/Makefile.am +=================================================================== +--- jamvm-1.4.5.orig/lib/Makefile.am ++++ jamvm-1.4.5/lib/Makefile.am +@@ -1,4 +1,4 @@ +-@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip ++@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath-initial/glibj.zip + @use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/ + + SUBDIRS = jamvm java gnu sun +Index: jamvm-1.4.5/src/dll.c +=================================================================== +--- jamvm-1.4.5.orig/src/dll.c ++++ jamvm-1.4.5/src/dll.c +@@ -294,7 +294,7 @@ char *getDllPath() { + } + + char *getBootDllPath() { +- return CLASSPATH_INSTALL_DIR"/lib/classpath"; ++ return CLASSPATH_INSTALL_DIR"/lib/classpath-initial"; + } + + char *getDllName(char *name) { +Index: jamvm-1.4.5/src/Makefile.am +=================================================================== +--- jamvm-1.4.5.orig/src/Makefile.am ++++ jamvm-1.4.5/src/Makefile.am +@@ -2,7 +2,7 @@ SUBDIRS = os + DIST_SUBDIRS = os arch + + bin_PROGRAMS = jamvm +-include_HEADERS = jni.h ++noinst_HEADERS = jni.h + + lib_LTLIBRARIES = libjvm.la + noinst_LTLIBRARIES = libcore.la +Index: jamvm-1.4.5/src/class.c +=================================================================== +--- jamvm-1.4.5.orig/src/class.c ++++ jamvm-1.4.5/src/class.c +@@ -1653,8 +1653,8 @@ void scanDirsForJars(char *directories) + } + + #ifdef USE_ZIP +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" +-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" ++#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip" ++#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip" + #else + #define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" diff --git a/recipes/jamvm/files/jamvm_1.5.0-initial.patch b/recipes/jamvm/files/jamvm_1.5.0-initial.patch new file mode 100644 index 0000000000..9b972da014 --- /dev/null +++ b/recipes/jamvm/files/jamvm_1.5.0-initial.patch @@ -0,0 +1,82 @@ +Index: jamvm-1.5.0/configure.ac +=================================================================== +--- jamvm-1.5.0.orig/configure.ac 2007-12-20 00:01:08.000000000 +0100 ++++ jamvm-1.5.0/configure.ac 2007-12-20 00:03:40.000000000 +0100 +@@ -22,7 +22,7 @@ + dnl Process this file with autoconf to produce a configure script. + + AC_INIT(src/jam.c) +-AM_INIT_AUTOMAKE(jamvm, 1.5.0) ++AM_INIT_AUTOMAKE(jamvm-initial, 1.5.0) + AC_CONFIG_HEADERS([src/config.h]) + AC_PREFIX_DEFAULT(/usr/local/jamvm) + +Index: jamvm-1.5.0/java-initial +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ jamvm-1.5.0/java-initial 2007-12-20 00:03:27.000000000 +0100 +@@ -0,0 +1,5 @@ ++#!/bin/sh ++# ++# Wrapper script inspired by the one provided by cacao. ++ ++exec jamvm-initial ${1+"$@"} +Index: jamvm-1.5.0/lib/Makefile.am +=================================================================== +--- jamvm-1.5.0.orig/lib/Makefile.am 2007-12-20 00:05:24.000000000 +0100 ++++ jamvm-1.5.0/lib/Makefile.am 2007-12-20 00:05:28.000000000 +0100 +@@ -19,7 +19,7 @@ + ## Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ## + +-CP_LIB_DIR = ${with_classpath_install_dir}/share/classpath ++CP_LIB_DIR = ${with_classpath_install_dir}/share/classpath-initial + GLIBJ_ZIP = ${CP_LIB_DIR}/glibj.zip + + SUBDIRS = jamvm java gnu sun +Index: jamvm-1.5.0/src/class.h +=================================================================== +--- jamvm-1.5.0.orig/src/class.h 2007-12-20 00:06:34.000000000 +0100 ++++ jamvm-1.5.0/src/class.h 2007-12-20 00:16:41.000000000 +0100 +@@ -39,11 +39,11 @@ + separate class files in a directory structure */ + + #ifdef USE_ZIP +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" +-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" ++#define JAMVM_CLASSES CLASSPATH_INSTALL_DIR"/share/jamvm-initial/classes.zip" ++#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip" + #else +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" +-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" ++#define JAMVM_CLASSES CLASSPATH_INSTALL_DIR"/share/jamvm-initial/classes" ++#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial" + #endif + + #define DFLT_BCP JAMVM_CLASSES":"CLASSPATH_CLASSES +Index: jamvm-1.5.0/src/dll.c +=================================================================== +--- jamvm-1.5.0.orig/src/dll.c 2007-12-20 00:01:24.000000000 +0100 ++++ jamvm-1.5.0/src/dll.c 2007-12-20 00:03:27.000000000 +0100 +@@ -294,7 +294,7 @@ + } + + char *getBootDllPath() { +- return CLASSPATH_INSTALL_DIR"/lib/classpath"; ++ return CLASSPATH_INSTALL_DIR"/lib/classpath-initial"; + } + + char *getDllName(char *name) { +Index: jamvm-1.5.0/src/Makefile.am +=================================================================== +--- jamvm-1.5.0.orig/src/Makefile.am 2007-12-20 00:21:37.000000000 +0100 ++++ jamvm-1.5.0/src/Makefile.am 2007-12-20 00:21:46.000000000 +0100 +@@ -23,7 +23,7 @@ + DIST_SUBDIRS = os arch interp + + bin_PROGRAMS = jamvm +-include_HEADERS = jni.h ++noinst_HEADERS = jni.h + + lib_LTLIBRARIES = libjvm.la + noinst_LTLIBRARIES = libcore.la |