Robert Schuster schrieb: > Hi Dalibor, > > Dalibor Topic schrieb: >> Is this the patch at >> http://lists.evolvis.org/pipermail/jalimo-commits/2007-August/000000.html ? > I have attached the one that is currently used for OE. And here is the one I propose for inclusion in kaffe. The idea is to have a --with-target-classpath-classes option which defines TARGET_CLASSPATH_CLASSES automake variable. In case the option is not used it is set to the value of CLASSPATH_CLASSES.
The TARGET_CLASSPATH_CLASSES automake variable is then used in libraries/javalib/Makefile.am to create the rt.jar link. I am no autoconf expert and am not sure whether this variable propagation thing works as expected. If not a different solution has to be found. Regards Robert
Index: configure.ac
===================================================================
RCS file: /cvs/kaffe/kaffe/configure.ac,v
retrieving revision 1.300
diff -u -r1.300 configure.ac
--- configure.ac 18 Jan 2008 18:49:00 -0000 1.300
+++ configure.ac 18 Jan 2008 22:22:47 -0000
@@ -704,6 +704,7 @@
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: m4/classpath.m4
===================================================================
RCS file: /cvs/kaffe/kaffe/m4/classpath.m4,v
retrieving revision 1.2
diff -u -r1.2 classpath.m4
--- m4/classpath.m4 14 Jun 2007 13:17:20 -0000 1.2
+++ m4/classpath.m4 18 Jan 2008 22:22:47 -0000
@@ -52,6 +52,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_CLASSES}])
+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
Index: libraries/javalib/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/javalib/Makefile.am,v
retrieving revision 1.465
diff -u -r1.465 Makefile.am
--- libraries/javalib/Makefile.am 2 Jan 2008 16:18:27 -0000 1.465
+++ libraries/javalib/Makefile.am 18 Jan 2008 22:22:47 -0000
@@ -38,7 +38,7 @@
install-data-local: installdirs
if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
- $(LN_S) $(CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \
+ $(LN_S) $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \
fi
uninstall-local:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ kaffe mailing list [email protected] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
