PatchSet 6860
Date: 2005/08/21 18:00:51
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fixed eclipse 3.1 startup
2005-08-21 Dalibor Topic <[EMAIL PROTECTED]>
Fixed Eclipse 3.1 startup.
* Makefile.am (BUILD_ENVIRONMENT) Adapted LD_LIBRARY_PATH to
make sure libraries are looked up in the right directory in
regression test cases.
* configure.ac: Check for shared library extension name.
* kaffe/kaffevm/external.c: Include config.h.
(initNative): Print full library name.
* libraries/clib/native/Runtime.c (LIBRARYSUFFIX) Set to
LTDL_SHLIB_EXT.
* test/jni/Makefile.am: (TESTS_ENVIRONMENT) Make sure the
native libraries are looked up in the right directory.
Members:
ChangeLog:1.4382->1.4383
Makefile.am:1.94->1.95
Makefile.in:1.217->1.218
configure:1.482->1.483
configure.ac:1.164->1.165
config/config.h.in:1.150->1.151
kaffe/kaffevm/external.c:1.82->1.83
libraries/clib/native/Runtime.c:1.36->1.37
test/jni/Makefile.am:1.11->1.12
test/jni/Makefile.in:1.43->1.44
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4382 kaffe/ChangeLog:1.4383
--- kaffe/ChangeLog:1.4382 Sun Aug 21 00:41:00 2005
+++ kaffe/ChangeLog Sun Aug 21 18:00:51 2005
@@ -1,5 +1,24 @@
2005-08-21 Dalibor Topic <[EMAIL PROTECTED]>
+ Fixed Eclipse 3.1 startup.
+
+ * Makefile.am (BUILD_ENVIRONMENT) Adapted LD_LIBRARY_PATH to
+ make sure libraries are looked up in the right directory in
+ regression test cases.
+
+ * configure.ac: Check for shared library extension name.
+
+ * kaffe/kaffevm/external.c: Include config.h.
+ (initNative): Print full library name.
+
+ * libraries/clib/native/Runtime.c (LIBRARYSUFFIX) Set to
+ LTDL_SHLIB_EXT.
+
+ * test/jni/Makefile.am: (TESTS_ENVIRONMENT) Make sure the
+ native libraries are looked up in the right directory.
+
+2005-08-21 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/lang/Runtime.java:
(loadLibrary) Add class loader to error message.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.94 kaffe/Makefile.am:1.95
--- kaffe/Makefile.am:1.94 Thu May 19 09:29:52 2005
+++ kaffe/Makefile.am Sun Aug 21 18:00:53 2005
@@ -165,7 +165,7 @@
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%/[^/]*$$%%'; done | (tr '\012' ' ';
echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH
>> 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 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
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.217 kaffe/Makefile.in:1.218
--- kaffe/Makefile.in:1.217 Sat Aug 13 15:38:43 2005
+++ kaffe/Makefile.in Sun Aug 21 18:00:53 2005
@@ -994,7 +994,7 @@
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%/[^/]*$$%%'; done | (tr '\012' ' ';
echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH
>> 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 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
Index: kaffe/configure
diff -u kaffe/configure:1.482 kaffe/configure:1.483
--- kaffe/configure:1.482 Fri Aug 19 18:40:20 2005
+++ kaffe/configure Sun Aug 21 18:00:53 2005
@@ -21658,6 +21658,28 @@
CCLD=${CCLD:-'$(CC)'}
+
+echo "$as_me:$LINENO: checking which extension is used for loadable modules"
>&5
+echo $ECHO_N "checking which extension is used for loadable modules...
$ECHO_C" >&6
+if test "${libltdl_cv_shlibext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+module=yes
+eval libltdl_cv_shlibext=$shrext_cmds
+
+fi
+echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
+echo "${ECHO_T}$libltdl_cv_shlibext" >&6
+if test -n "$libltdl_cv_shlibext"; then
+
+cat >>confdefs.h <<_ACEOF
+#define LTDL_SHLIB_EXT "$libltdl_cv_shlibext"
+_ACEOF
+
+fi
+
+
# ===========================================================================
# Configure gettext (needed for libiconv scripts)
# ===========================================================================
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.164 kaffe/configure.ac:1.165
--- kaffe/configure.ac:1.164 Fri Aug 19 18:40:34 2005
+++ kaffe/configure.ac Sun Aug 21 18:00:58 2005
@@ -303,6 +303,8 @@
CCLD=${CCLD:-'$(CC)'}
AC_SUBST(CCLD)
+AC_LTDL_SHLIBEXT
+
# ===========================================================================
# Configure gettext (needed for libiconv scripts)
# ===========================================================================
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.150 kaffe/config/config.h.in:1.151
--- kaffe/config/config.h.in:1.150 Fri Aug 19 18:40:38 2005
+++ kaffe/config/config.h.in Sun Aug 21 18:01:01 2005
@@ -750,6 +750,9 @@
/* Enable debugging symbol generation for jitted code */
#undef KAFFE_XDEBUGGING
+/* Define to the extension used for shared libraries, say, ".so". */
+#undef LTDL_SHLIB_EXT
+
/* Defined if we need a replacement for semaphores */
#undef NEED_REPLACEMENT_SEMAPHORES
Index: kaffe/kaffe/kaffevm/external.c
diff -u kaffe/kaffe/kaffevm/external.c:1.82 kaffe/kaffe/kaffevm/external.c:1.83
--- kaffe/kaffe/kaffevm/external.c:1.82 Tue Jul 19 16:27:35 2005
+++ kaffe/kaffe/kaffevm/external.c Sun Aug 21 18:01:02 2005
@@ -12,13 +12,14 @@
* of this file.
*/
+#include "config.h"
+
#if defined(HAVE_STDARG_H)
#include <stdarg.h>
#endif /* defined(HAVE_STDARG_H) */
#include <stdio.h>
-#include "config.h"
#include "debug.h"
#include "config-std.h"
#include "config-mem.h"
@@ -183,7 +184,7 @@
return;
}
}
- dprintf("Failed to locate native library \"%s\" in path:\n",
NATIVELIBRARY);
+ dprintf("Failed to locate native library \"%s\" in path:\n", lib);
dprintf("\t%s\n", libraryPath);
dprintf("Aborting.\n");
fflush(stderr);
Index: kaffe/libraries/clib/native/Runtime.c
diff -u kaffe/libraries/clib/native/Runtime.c:1.36
kaffe/libraries/clib/native/Runtime.c:1.37
--- kaffe/libraries/clib/native/Runtime.c:1.36 Tue Jul 19 01:16:32 2005
+++ kaffe/libraries/clib/native/Runtime.c Sun Aug 21 18:01:02 2005
@@ -30,7 +30,7 @@
#endif
#ifndef LIBRARYSUFFIX
-#define LIBRARYSUFFIX ""
+#define LIBRARYSUFFIX LTDL_SHLIB_EXT
#endif
extern jboolean runFinalizerOnExit;
Index: kaffe/test/jni/Makefile.am
diff -u kaffe/test/jni/Makefile.am:1.11 kaffe/test/jni/Makefile.am:1.12
--- kaffe/test/jni/Makefile.am:1.11 Sun Aug 14 18:36:41 2005
+++ kaffe/test/jni/Makefile.am Sun Aug 21 18:01:02 2005
@@ -120,7 +120,7 @@
EXTRA_DIST = \
JNIWeakTest.java
-TESTS_ENVIRONMENT = env `BOOTCLASSPATH="."; export BOOTCLASSPATH;
KAFFELIBRARYPATH="." ; export KAFFELIBRARYPATH ; .
$(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' <
$(top_builddir)/BUILD_ENVIRONMENT | sh`
+TESTS_ENVIRONMENT = env `BOOTCLASSPATH="."; export BOOTCLASSPATH;
KAFFELIBRARYPATH=".libs/" ; export KAFFELIBRARYPATH ; .
$(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' <
$(top_builddir)/BUILD_ENVIRONMENT | sh`
TESTS = $(check_PROGRAMS)
CLEANFILES = *.fail *.out core *.core *.class
Index: kaffe/test/jni/Makefile.in
diff -u kaffe/test/jni/Makefile.in:1.43 kaffe/test/jni/Makefile.in:1.44
--- kaffe/test/jni/Makefile.in:1.43 Sun Aug 14 18:36:41 2005
+++ kaffe/test/jni/Makefile.in Sun Aug 21 18:01:03 2005
@@ -487,7 +487,7 @@
EXTRA_DIST = \
JNIWeakTest.java
-TESTS_ENVIRONMENT = env `BOOTCLASSPATH="."; export BOOTCLASSPATH;
KAFFELIBRARYPATH="." ; export KAFFELIBRARYPATH ; .
$(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' <
$(top_builddir)/BUILD_ENVIRONMENT | sh`
+TESTS_ENVIRONMENT = env `BOOTCLASSPATH="."; export BOOTCLASSPATH;
KAFFELIBRARYPATH=".libs/" ; export KAFFELIBRARYPATH ; .
$(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' <
$(top_builddir)/BUILD_ENVIRONMENT | sh`
TESTS = $(check_PROGRAMS)
CLEANFILES = *.fail *.out core *.core *.class
all: all-am
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
