PatchSet 6868
Date: 2005/08/24 02:23:09
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fixed make check for FreeBSD
2005-08-24 Dalibor Topic <[EMAIL PROTECTED]>
* Makefile.am: (KAFFELIBRARYPATH) Fixed them again
to work without having GNU findutils.
Reported by: Ito Kazumitsu <[EMAIL PROTECTED]>,
Andreas Tobler <[EMAIL PROTECTED]>
Members:
ChangeLog:1.4389->1.4390
Makefile.am:1.95->1.96
Makefile.in:1.218->1.219
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4389 kaffe/ChangeLog:1.4390
--- kaffe/ChangeLog:1.4389 Mon Aug 22 12:38:34 2005
+++ kaffe/ChangeLog Wed Aug 24 02:23:09 2005
@@ -1,3 +1,11 @@
+2005-08-24 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * Makefile.am: (KAFFELIBRARYPATH) Fixed them again
+ to work without having GNU findutils.
+
+ Reported by: Ito Kazumitsu <[EMAIL PROTECTED]>,
+ Andreas Tobler <[EMAIL PROTECTED]>
+
2005-08-22 Dalibor Topic <[EMAIL PROTECTED]>
* config/i386/freebsd2/md.c: Include sys/types.h
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.95 kaffe/Makefile.am:1.96
--- kaffe/Makefile.am:1.95 Sun Aug 21 18:00:53 2005
+++ kaffe/Makefile.am Wed Aug 24 02:23:12 2005
@@ -165,10 +165,8 @@
BUILD_ENVIRONMENT-make: Makefile
echo
BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_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%/[^/]*$$%%' | xargs -n 1 -iXXX echo
XXX"/.libs"; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/
/\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
+ echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/classpath/.libs\;
export KAFFELIBRARYPATH >> 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:\$${LD_LIBRARY_PATH}\;
export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
- echo
DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs:\$${DYLD_LIBRARY_PATH}\;
export DYLD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.218 kaffe/Makefile.in:1.219
--- kaffe/Makefile.in:1.218 Sun Aug 21 18:00:53 2005
+++ kaffe/Makefile.in Wed Aug 24 02:23:12 2005
@@ -994,10 +994,8 @@
BUILD_ENVIRONMENT-make: Makefile
echo
BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\''$(PATHSEP)'\'\;
export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >
BUILD_ENVIRONMENT.new; \
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_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%/[^/]*$$%%' | xargs -n 1 -iXXX echo
XXX"/.libs"; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/
/\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \
+ echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}$(top_builddir)/libraries/clib/native/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/net/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/io/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/nio/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/zip/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/management/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/security/.libs\''$(PATHSEP)'\'$(top_builddir)/libraries/clib/classpath/.libs\;
export KAFFELIBRARYPATH >> 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:\$${LD_LIBRARY_PATH}\;
export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
- echo
DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs:\$${DYLD_LIBRARY_PATH}\;
export DYLD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
