PatchSet 5734
Date: 2004/12/31 13:48:19
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Small fix for libclasspath bootstrap problems on OpenBSD
2004-12-31 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/Makefile.am.in (LD_LIBRARY_PATH): Added to
fix bootstrap problems on OpenBSD.
Reported by: Riccardo Mottola <[EMAIL PROTECTED]>
Suggested by: Guilhem Lavaux <[EMAIL PROTECTED]>
* libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in:
Regenerated.
Members:
ChangeLog:1.3278->1.3279
libraries/javalib/Makefile.am:1.284->1.285
libraries/javalib/Makefile.am.in:1.29->1.30
libraries/javalib/Makefile.in:1.366->1.367
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3278 kaffe/ChangeLog:1.3279
--- kaffe/ChangeLog:1.3278 Fri Dec 31 11:07:05 2004
+++ kaffe/ChangeLog Fri Dec 31 13:48:19 2004
@@ -1,3 +1,15 @@
+2004-12-31 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/javalib/Makefile.am.in (LD_LIBRARY_PATH): Added to
+ fix bootstrap problems on OpenBSD.
+
+ Reported by: Riccardo Mottola <[EMAIL PROTECTED]>
+ Suggested by: Guilhem Lavaux <[EMAIL PROTECTED]>
+
+ * libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in:
+ Regenerated.
+
2004-12-30 Guilhem Lavaux <[EMAIL PROTECTED]>
* include/Makefile.am
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.284
kaffe/libraries/javalib/Makefile.am:1.285
--- kaffe/libraries/javalib/Makefile.am:1.284 Thu Dec 23 02:43:09 2004
+++ kaffe/libraries/javalib/Makefile.am Fri Dec 31 13:48:24 2004
@@ -48,6 +48,10 @@
BOOTCLASSPATH=$(LIBDIR):$(srcdir)/Klasses.jar.bootstrap
JAR=BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH)
$(JAVA) kaffe.tools.jar.Jar
+## Workaround for bootstrap on OpenBSD where the libclasspath
+## doesn't seem to get linked in otherwise.
+LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/
+
jrelib_DATA = \
rt.jar \
logging.properties
@@ -4801,4 +4805,4 @@
build-classes Klasses: rt.jar
all-am: rebuildLib
-export JIKES top_builddir LIBDIR srcdir
+export JIKES top_builddir LIBDIR srcdir LD_LIBRARY_PATH
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.29
kaffe/libraries/javalib/Makefile.am.in:1.30
--- kaffe/libraries/javalib/Makefile.am.in:1.29 Tue Dec 21 17:31:43 2004
+++ kaffe/libraries/javalib/Makefile.am.in Fri Dec 31 13:48:24 2004
@@ -48,6 +48,10 @@
BOOTCLASSPATH=$(LIBDIR):$(srcdir)/Klasses.jar.bootstrap
JAR=BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH)
$(JAVA) kaffe.tools.jar.Jar
+## Workaround for bootstrap on OpenBSD where the libclasspath
+## doesn't seem to get linked in otherwise.
+LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/
+
jrelib_DATA = \
rt.jar \
logging.properties
@@ -258,4 +262,4 @@
build-classes Klasses: rt.jar
all-am: rebuildLib
-export JIKES top_builddir LIBDIR srcdir
+export JIKES top_builddir LIBDIR srcdir LD_LIBRARY_PATH
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.366
kaffe/libraries/javalib/Makefile.in:1.367
--- kaffe/libraries/javalib/Makefile.in:1.366 Thu Dec 23 02:43:10 2004
+++ kaffe/libraries/javalib/Makefile.in Fri Dec 31 13:48:25 2004
@@ -399,6 +399,7 @@
KAFFELIBRARYPATH =
$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/:$(top_builddir)/libraries/clib/security/:$(top_builddir)/libraries/clib/classpath/
BOOTCLASSPATH = $(LIBDIR):$(srcdir)/Klasses.jar.bootstrap
JAR = BOOTCLASSPATH=$(BOOTCLASSPATH) KAFFELIBRARYPATH=$(KAFFELIBRARYPATH)
$(JAVA) kaffe.tools.jar.Jar
+LD_LIBRARY_PATH = $(top_builddir)/libraries/clib/classpath/
jrelib_DATA = \
rt.jar \
logging.properties
@@ -5752,7 +5753,7 @@
build-classes Klasses: rt.jar
all-am: rebuildLib
-export JIKES top_builddir LIBDIR srcdir
+export JIKES top_builddir LIBDIR srcdir LD_LIBRARY_PATH
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
