diff options
author | Michael Lauer <mickey@vanille-media.de> | 2008-06-27 16:05:50 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2008-06-27 16:05:50 +0000 |
commit | 882473c9913cf09da1f8e89738cb859e1e8bd882 (patch) | |
tree | 818e039de162dcbc73f7826c28687132055dc561 /packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch | |
parent | 31c3d2f534c933df59abd3f594d177b781e549ba (diff) | |
parent | f3b6b70f150b257afef3d025c1ed86b9270966b3 (diff) | |
download | openembedded-882473c9913cf09da1f8e89738cb859e1e8bd882.tar.gz |
merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
and '77f81ea18669b5c79145faa5f0a96df1d7db3232'
Diffstat (limited to 'packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch')
-rw-r--r-- | packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch b/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch new file mode 100644 index 0000000000..7df1c480ea --- /dev/null +++ b/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch @@ -0,0 +1,53 @@ +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) |