diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-07-13 13:05:20 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-07-13 13:05:20 +0000 |
| commit | ab2995c706c3c32b2002196d43bbfbecca6707df (patch) | |
| tree | 46ad5ae544745b3575cb16d12969bf6974cc6c16 /packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch | |
| parent | e0d701ba170b9da4a9d8b6fbe25d4054c34ec632 (diff) | |
| parent | f4a5a9ebee7381a948c8a34c8d63cbf9dd36912b (diff) | |
merge of 'dea5fd7f1b27baf261b5d668733d4ab001554649'
and 'e0f1f9bc5dd648488bd0c935a9b9ee33a518f15d'
Diffstat (limited to 'packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch')
| -rw-r--r-- | packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch b/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch deleted file mode 100644 index dffc37b343..0000000000 --- a/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -r 8484332b813c configure.ac ---- a/configure.ac Sun Jun 22 18:19:54 2008 +0200 -+++ b/configure.ac Mon Jun 23 08:53:17 2008 +0200 -@@ -550,6 +550,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 -diff -r 8484332b813c m4/java-runtime-library.m4 ---- a/m4/java-runtime-library.m4 Sun Jun 22 18:19:54 2008 +0200 -+++ b/m4/java-runtime-library.m4 Mon Jun 23 08:53:17 2008 +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) |