changeset in /hg/icedtea6: 2008-04-21 Lillian Angel <langel at re...

[Lillian Angel]

changeset d72c26939d8a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d72c26939d8a
description:
	2008-04-21  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-lib64.patch: Fixed order of library paths on 64-bit.
	        * generated/*: Regenerated.

diffstat:

4 files changed, 16 insertions(+), 10 deletions(-)
ChangeLog                                 |    5 +++++
generated/sun/misc/Version.java           |    2 +-
generated/sun/tools/jconsole/Version.java |    2 +-
patches/icedtea-lib64.patch               |   17 +++++++++--------

diffs (64 lines):

diff -r db72f04f6dd5 -r d72c26939d8a ChangeLog
--- a/ChangeLog	Mon Apr 21 17:12:05 2008 +0200
+++ b/ChangeLog	Mon Apr 21 14:06:06 2008 -0400
@@ -1,3 +1,8 @@ 2008-04-21  Christian Thalinger  <twisti
+2008-04-21  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-lib64.patch: Fixed order of library paths on 64-bit.
+	* generated/*: Regenerated.
+
 2008-04-21  Christian Thalinger  <twisti at complang.tuwien.ac.at>
 
 	* ChangeLog: Fixed a typo in my name.
diff -r db72f04f6dd5 -r d72c26939d8a generated/sun/misc/Version.java
--- a/generated/sun/misc/Version.java	Mon Apr 21 17:12:05 2008 +0200
+++ b/generated/sun/misc/Version.java	Mon Apr 21 14:06:06 2008 -0400
@@ -39,7 +39,7 @@ public class Version {
         "IcedTea Runtime Environment";
 
     private static final String java_runtime_version =
-        "1.6.0-b06";
+        "1.6.0-b09";
 
     static {
         init();
diff -r db72f04f6dd5 -r d72c26939d8a generated/sun/tools/jconsole/Version.java
--- a/generated/sun/tools/jconsole/Version.java	Mon Apr 21 17:12:05 2008 +0200
+++ b/generated/sun/tools/jconsole/Version.java	Mon Apr 21 14:06:06 2008 -0400
@@ -29,7 +29,7 @@ import java.io.PrintStream;
 
 public class Version {
     private static final String jconsole_version =
-        "1.6.0-b06";
+        "1.6.0-b09";
 
     public static void print(PrintStream ps) {
         printFullVersion(ps);
diff -r db72f04f6dd5 -r d72c26939d8a patches/icedtea-lib64.patch
--- a/patches/icedtea-lib64.patch	Mon Apr 21 17:12:05 2008 +0200
+++ b/patches/icedtea-lib64.patch	Mon Apr 21 14:06:06 2008 -0400
@@ -1,15 +1,16 @@
 --- origopenjdk/hotspot/src/os/linux/vm/os_linux.cpp	2008-01-04 18:11:53.000000000 -0500
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2008-01-11 11:15:24.000000000 -0500
-@@ -271,7 +271,12 @@
-  *        ...
-  *        7: The default directories, normally /lib and /usr/lib.
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2008-04-21 14:00:59.000000000 -0400
+@@ -265,7 +265,12 @@
+  *	  ...
+  *	  7: The default directories, normally /lib and /usr/lib.
   */
+-#define DEFAULT_LIBPATH	"/lib:/usr/lib"
 +
 +#if defined(AMD64) || defined(_LP64) && (defined(PPC) || defined(S390))
-+#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib64:/lib64"
++#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/usr/local/lib64:/lib:/usr/lib:/usr/local/lib"
 +#else
- #define DEFAULT_LIBPATH "/lib:/usr/lib"
++#define DEFAULT_LIBPATH	"/lib:/usr/lib:/usr/local/lib"
 +#endif
  
- #define EXTENSIONS_DIR  "/lib/ext"
- #define ENDORSED_DIR    "/lib/endorsed"
+ #define EXTENSIONS_DIR	"/lib/ext"
+ #define ENDORSED_DIR	"/lib/endorsed"