changeset in /hg/icedtea: 2008-01-11 Lillian Angel <langel at red...

[Lillian Angel]

changeset 40d539754590 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=40d539754590
description:
	2008-01-11  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-lib64.patch: New patch. Properly sets system
	        property java.library.path on 64-bit.
	        * Makefile.am: Added new patch to the list.
	        * Makefile.in: Regenerated.
	        * .hgignore: Updated.

diffstat:

5 files changed, 27 insertions(+), 15 deletions(-)
.hgignore                   |   16 +---------------
ChangeLog                   |    8 ++++++++
Makefile.am                 |    1 +
Makefile.in                 |    2 ++
patches/icedtea-lib64.patch |   15 +++++++++++++++

diffs (80 lines):

diff -r 0a9a1dfc3ff4 -r 40d539754590 .hgignore
--- a/.hgignore	Fri Jan 11 09:03:32 2008 -0500
+++ b/.hgignore	Fri Jan 11 12:02:29 2008 -0500
@@ -418,18 +418,4 @@ rt/javax/net/ssl/X509ExtendedKeyManager.
 rt/javax/net/ssl/X509ExtendedKeyManager.java
 rt/javax/net/ssl/X509KeyManager.java
 rt/javax/net/ssl/X509TrustManager.java
-generated/java/lang/CharacterData00.java
-generated/java/lang/CharacterData01.java
-generated/java/lang/CharacterData02.java
-generated/java/lang/CharacterData0E.java
-generated/java/lang/CharacterDataLatin1.java
-generated/sun/awt/X11/XAWTIcon32_java_icon16_png.java
-generated/sun/awt/X11/XAWTIcon32_java_icon24_png.java
-generated/sun/awt/X11/XAWTIcon32_java_icon32_png.java
-generated/sun/awt/X11/XAWTIcon32_java_icon48_png.java
-generated/sun/awt/X11/XAWTIcon64_java_icon16_png.java
-generated/sun/awt/X11/XAWTIcon64_java_icon24_png.java
-generated/sun/awt/X11/XAWTIcon64_java_icon32_png.java
-generated/sun/awt/X11/XAWTIcon64_java_icon48_png.java
-generated/sun/awt/X11/generator/sizer.32
-generated/sun/awt/X11/generator/sizer.32.c
+generated/sun/awt/X11/generator/sizer.32.orig
diff -r 0a9a1dfc3ff4 -r 40d539754590 ChangeLog
--- a/ChangeLog	Fri Jan 11 09:03:32 2008 -0500
+++ b/ChangeLog	Fri Jan 11 12:02:29 2008 -0500
@@ -1,3 +1,11 @@ 2008-01-11  Lillian Angel  <langel at redha
+2008-01-11  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-lib64.patch: New patch. Properly sets system
+	property java.library.path on 64-bit.
+	* Makefile.am: Added new patch to the list.
+	* Makefile.in: Regenerated.
+	* .hgignore: Updated.
+
 2008-01-11  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am
diff -r 0a9a1dfc3ff4 -r 40d539754590 Makefile.am
--- a/Makefile.am	Fri Jan 11 09:03:32 2008 -0500
+++ b/Makefile.am	Fri Jan 11 12:02:29 2008 -0500
@@ -227,6 +227,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-timerqueue.patch \
 	patches/icedtea-jnlp-launcher.patch \
 	patches/icedtea-generated.patch \
+	patches/icedtea-lib64.patch
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 0a9a1dfc3ff4 -r 40d539754590 Makefile.in
--- a/Makefile.in	Fri Jan 11 09:03:32 2008 -0500
+++ b/Makefile.in	Fri Jan 11 12:02:29 2008 -0500
@@ -666,6 +666,8 @@ stamps/ports.stamp: stamps/clone.stamp
 	done
 	mkdir -p stamps
 	touch stamps/ports.stamp
+	$(FAST_BUILD_PATCH) \
+	$(DISTRIBUTION_PATCHES)
 
 stamps/patch.stamp: stamps/clone.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
diff -r 0a9a1dfc3ff4 -r 40d539754590 patches/icedtea-lib64.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-lib64.patch	Fri Jan 11 12:02:29 2008 -0500
@@ -0,0 +1,15 @@
+--- 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
+@@ -262,7 +268,12 @@
+  *        ...
+  *        7: The default directories, normally /lib and /usr/lib.
+  */
++
++#ifdef __amd64__
++#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/lib64:/lib64"
++#else
+ #define DEFAULT_LIBPATH "/lib:/usr/lib"
++#endif
+ 
+ #define EXTENSIONS_DIR  "/lib/ext"
+ #define ENDORSED_DIR    "/lib/endorsed"