PatchSet 5830
Date: 2005/01/10 07:14:22
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fixes for Darwin and a fix for bootstrap.
* Makefile.am
(BUILD_ENVIRONMENT): Add classpath to (DY)LD_LIBRARY_PATH.
* libraries/javalib/Makefile.am.in: Do not build LD_LIBRARY_PATH.
* Makefile.in, libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in: Regenerated.
* libraries/javalib/bootstrap.classlist: Added java.util.Currency.
* libraries/javalib/Klasses.jar.bootstrap: Regenerated.
Members:
ChangeLog:1.3374->1.3375
Makefile.am:1.81->1.82
Makefile.in:1.191->1.192
libraries/javalib/Klasses.jar.bootstrap:1.82->1.83
libraries/javalib/Makefile.am:1.291->1.292
libraries/javalib/Makefile.am.in:1.30->1.31
libraries/javalib/Makefile.in:1.373->1.374
libraries/javalib/bootstrap.classlist:1.68->1.69
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3374 kaffe/ChangeLog:1.3375
--- kaffe/ChangeLog:1.3374 Sun Jan 9 21:05:38 2005
+++ kaffe/ChangeLog Mon Jan 10 07:14:22 2005
@@ -1,3 +1,17 @@
+2005-01-09 Guilhem Lavaux <[EMAIL PROTECTED]>
+
+ * Makefile.am
+ (BUILD_ENVIRONMENT): Add classpath to (DY)LD_LIBRARY_PATH.
+
+ * libraries/javalib/Makefile.am.in: Do not build LD_LIBRARY_PATH.
+
+ * Makefile.in, libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in: Regenerated.
+
+ * libraries/javalib/bootstrap.classlist: Added java.util.Currency.
+
+ * libraries/javalib/Klasses.jar.bootstrap: Regenerated.
+
2005-01-09 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/beans/GenericBeanInfo.java:
@@ -49,7 +63,7 @@
libraries/javalib/java/lang/Integer.java,
libraries/javalib/java/lang/Long.java,
libraries/javalib/java/lang/Short.java:
- Replaced by implemenation from GNU Classpath.
+ Replaced by implementation from GNU Classpath.
* test/regression/ProcessClassInst.java,
test/regression/ProcessClassStop.java:
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.81 kaffe/Makefile.am:1.82
--- kaffe/Makefile.am:1.81 Tue Sep 28 16:26:24 2004
+++ kaffe/Makefile.am Mon Jan 10 07:14:25 2005
@@ -138,7 +138,9 @@
echo
BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new;
\
echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for
f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' ';
echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH
>> BUILD_ENVIRONMENT.new; \
- echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new
+ echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
+ echo LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\;
export LD_LIBRARY_PATH; \
+ echo DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\;
export DYLD_LIBRARY_PATH
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.191 kaffe/Makefile.in:1.192
--- kaffe/Makefile.in:1.191 Wed Dec 22 19:04:37 2004
+++ kaffe/Makefile.in Mon Jan 10 07:14:25 2005
@@ -974,7 +974,9 @@
echo
BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new;
\
echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for
f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' ';
echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH
>> BUILD_ENVIRONMENT.new; \
- echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new
+ echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
+ echo LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\;
export LD_LIBRARY_PATH; \
+ echo DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\;
export DYLD_LIBRARY_PATH
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/libraries/javalib/Klasses.jar.bootstrap
cvs rdiff: failed to read diff file header /tmp/cvsUGhYiX for
Klasses.jar.bootstrap,v: end of file
system command returned non-zero exit status: 1: aborting
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
