From 35f18dca2645f3242e015025c79ac58da0d13748 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 22 May 2008 07:54:48 +0000 Subject: cacao: change hg rev to corresponding date. * Hi John Lee, please use the corresponding date instead of the hg revision number. Reason is that in mercurial revision numbers are local and not equal between different users. Regards Robert --- .../files/cacao-hg20080519-classpath_var.patch | 67 ++++++++++++++++++++++ packages/cacao/files/cacao-hg20080519-libdir.patch | 30 ++++++++++ .../cacao/files/cacao-hg8190-classpath_var.patch | 67 ---------------------- packages/cacao/files/cacao-hg8190-libdir.patch | 30 ---------- 4 files changed, 97 insertions(+), 97 deletions(-) create mode 100644 packages/cacao/files/cacao-hg20080519-classpath_var.patch create mode 100644 packages/cacao/files/cacao-hg20080519-libdir.patch delete mode 100644 packages/cacao/files/cacao-hg8190-classpath_var.patch delete mode 100644 packages/cacao/files/cacao-hg8190-libdir.patch (limited to 'packages/cacao/files') diff --git a/packages/cacao/files/cacao-hg20080519-classpath_var.patch b/packages/cacao/files/cacao-hg20080519-classpath_var.patch new file mode 100644 index 0000000000..a3e39e0062 --- /dev/null +++ b/packages/cacao/files/cacao-hg20080519-classpath_var.patch @@ -0,0 +1,67 @@ +Index: cacao/configure.ac +=================================================================== +--- cacao.orig/configure.ac 2008-05-21 14:16:33.000000000 +0800 ++++ cacao/configure.ac 2008-05-21 15:57:42.000000000 +0800 +@@ -772,6 +772,7 @@ + + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX + AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES ++AC_CHECK_WITH_TARGET_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-05-21 14:16:34.000000000 +0800 ++++ cacao/m4/java-runtime-library.m4 2008-05-21 16:18:23.000000000 +0800 +@@ -106,6 +106,29 @@ + ]) + + ++dnl where are Java runtime library classes installed on the target ++ ++AC_DEFUN([AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES],[ ++AC_MSG_CHECKING(where Java runtime library classes are installed on the target) ++AC_ARG_WITH([target-java-runtime-library-classes], ++ [AS_HELP_STRING(--with-target-java-runtime-library-classes=,path to Java runtime library classes (includes the name of the file and may be flat) [[default=(gnuclasspath:${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip,openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes,*:${JAVA_RUNTIME_LIBRARY_PREFIX})]])], ++ [TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}], ++ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in ++ gnuclasspath) ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip ++ ;; ++ openjdk) ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes ++ ;; ++ *) ++ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX} ++ ;; ++ esac]) ++AC_MSG_RESULT(${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES}) ++AC_DEFINE_UNQUOTED([TARGET_JAVA_RUNTIME_LIBRARY_CLASSES], "${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes on the target]) ++AC_SUBST(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES) ++]) ++ + dnl where are Java runtime library native libraries installed + + AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[ +Index: cacao/src/vm/properties.c +=================================================================== +--- cacao.orig/src/vm/properties.c 2008-05-21 14:16:34.000000000 +0800 ++++ cacao/src/vm/properties.c 2008-05-21 16:16:24.000000000 +0800 +@@ -295,14 +295,14 @@ + len = + strlen(CACAO_VM_ZIP) + + strlen(":") + +- strlen(JAVA_RUNTIME_LIBRARY_CLASSES) + ++ strlen(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES) + + strlen("0"); + + boot_class_path = MNEW(char, len); + + strcpy(boot_class_path, CACAO_VM_ZIP); + strcat(boot_class_path, ":"); +- strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_CLASSES); ++ strcat(boot_class_path, TARGET_JAVA_RUNTIME_LIBRARY_CLASSES); + + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) + diff --git a/packages/cacao/files/cacao-hg20080519-libdir.patch b/packages/cacao/files/cacao-hg20080519-libdir.patch new file mode 100644 index 0000000000..1be13b3cfd --- /dev/null +++ b/packages/cacao/files/cacao-hg20080519-libdir.patch @@ -0,0 +1,30 @@ +Index: cacao/src/vm/properties.c +=================================================================== +--- cacao.orig/src/vm/properties.c 2008-05-21 15:26:21.000000000 +0800 ++++ cacao/src/vm/properties.c 2008-05-21 15:28:59.000000000 +0800 +@@ -211,15 +211,22 @@ + + # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH) + +- boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath"; ++ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath:OE_LIBDIR_JNI"; + + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) + +- boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR; ++ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR":OE_LIBDIR_JNI"; + + # elif defined(WITH_JAVA_RUNTIME_LIBRARY_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 diff --git a/packages/cacao/files/cacao-hg8190-classpath_var.patch b/packages/cacao/files/cacao-hg8190-classpath_var.patch deleted file mode 100644 index a3e39e0062..0000000000 --- a/packages/cacao/files/cacao-hg8190-classpath_var.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: cacao/configure.ac -=================================================================== ---- cacao.orig/configure.ac 2008-05-21 14:16:33.000000000 +0800 -+++ cacao/configure.ac 2008-05-21 15:57:42.000000000 +0800 -@@ -772,6 +772,7 @@ - - AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX - AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES -+AC_CHECK_WITH_TARGET_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-05-21 14:16:34.000000000 +0800 -+++ cacao/m4/java-runtime-library.m4 2008-05-21 16:18:23.000000000 +0800 -@@ -106,6 +106,29 @@ - ]) - - -+dnl where are Java runtime library classes installed on the target -+ -+AC_DEFUN([AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES],[ -+AC_MSG_CHECKING(where Java runtime library classes are installed on the target) -+AC_ARG_WITH([target-java-runtime-library-classes], -+ [AS_HELP_STRING(--with-target-java-runtime-library-classes=,path to Java runtime library classes (includes the name of the file and may be flat) [[default=(gnuclasspath:${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip,openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes,*:${JAVA_RUNTIME_LIBRARY_PREFIX})]])], -+ [TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}], -+ [case "${WITH_JAVA_RUNTIME_LIBRARY}" in -+ gnuclasspath) -+ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip -+ ;; -+ openjdk) -+ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes -+ ;; -+ *) -+ TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX} -+ ;; -+ esac]) -+AC_MSG_RESULT(${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES}) -+AC_DEFINE_UNQUOTED([TARGET_JAVA_RUNTIME_LIBRARY_CLASSES], "${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes on the target]) -+AC_SUBST(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES) -+]) -+ - dnl where are Java runtime library native libraries installed - - AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[ -Index: cacao/src/vm/properties.c -=================================================================== ---- cacao.orig/src/vm/properties.c 2008-05-21 14:16:34.000000000 +0800 -+++ cacao/src/vm/properties.c 2008-05-21 16:16:24.000000000 +0800 -@@ -295,14 +295,14 @@ - len = - strlen(CACAO_VM_ZIP) + - strlen(":") + -- strlen(JAVA_RUNTIME_LIBRARY_CLASSES) + -+ strlen(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES) + - strlen("0"); - - boot_class_path = MNEW(char, len); - - strcpy(boot_class_path, CACAO_VM_ZIP); - strcat(boot_class_path, ":"); -- strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_CLASSES); -+ strcat(boot_class_path, TARGET_JAVA_RUNTIME_LIBRARY_CLASSES); - - # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) - diff --git a/packages/cacao/files/cacao-hg8190-libdir.patch b/packages/cacao/files/cacao-hg8190-libdir.patch deleted file mode 100644 index 1be13b3cfd..0000000000 --- a/packages/cacao/files/cacao-hg8190-libdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: cacao/src/vm/properties.c -=================================================================== ---- cacao.orig/src/vm/properties.c 2008-05-21 15:26:21.000000000 +0800 -+++ cacao/src/vm/properties.c 2008-05-21 15:28:59.000000000 +0800 -@@ -211,15 +211,22 @@ - - # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH) - -- boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath"; -+ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath:OE_LIBDIR_JNI"; - - # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK) - -- boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR; -+ boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR":OE_LIBDIR_JNI"; - - # elif defined(WITH_JAVA_RUNTIME_LIBRARY_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 -- cgit v1.2.3