libgcj-$VERSION changes
David S. Miller
davem@redhat.com
Tue May 21 12:27:00 GMT 2002
From: Anthony Green <green@redhat.com>
Date: 17 May 2002 12:32:53 -0700
On Fri, 2002-05-17 at 00:05, David S. Miller wrote:
> It seems to me that your mainline version of the change should be put
> into the 3.1 branch libjava.exp like so:
Yes -- I agree. I don't think any of us thought about the impact of the
branch patch post 3.1... :-(
Thanks for looking into this David.
No problem.
Installed on the branch as follows:
2002-04-12 Anthony Green <green@redhat.com>
* lib/libjava.exp: Use libgcj-VERSION.jar, not libgcj-3.1.jar.
--- testsuite/lib/libjava.exp.~1~ Wed May 8 19:04:05 2002
+++ testsuite/lib/libjava.exp Fri May 17 00:05:28 2002
@@ -112,6 +112,7 @@
global TOOL_EXECUTABLE
global original_ld_library_path
global env objdir
+ global env gcc_version
global tool_root_dir
global libjava_libgcc_s_path
@@ -129,6 +130,11 @@
}
}
+ # Determine the version so we can find the libgcj jar file.
+ set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"]
+ regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version
+ verbose "jar file is libgcj-$gcc_version.jar"
+
# FIXME: This finds libgcj.spec for the default multilib.
# If thread models differ between multilibs, this has to be moved
# to libjava_arguments
@@ -265,6 +271,7 @@
global runtests
global env
global tool_root_dir
+ global gcc_version
global libjava_libgcc_s_path
if [info exists LIBJAVA] {
@@ -330,9 +337,9 @@
verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
# Set the CLASSPATH environment variable
- verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-3.1.jar"
+ verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
global env
- set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-3.1.jar"
+ set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
if {$mode == "link"} {
global wrapper_file wrap_compile_flags;
More information about the Java-patches
mailing list