changeset in /hg/icedtea: 2008-02-13 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 0b96da5cdc36 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0b96da5cdc36
description:
	2008-02-13  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-core-build.patch: Fixed broken JVM location.

diffstat:

2 files changed, 18 insertions(+), 12 deletions(-)
ChangeLog                        |    4 ++++
patches/icedtea-core-build.patch |   26 ++++++++++++++------------

diffs (61 lines):

diff -r f8c125bf025b -r 0b96da5cdc36 ChangeLog
--- a/ChangeLog	Wed Feb 13 11:38:31 2008 -0500
+++ b/ChangeLog	Wed Feb 13 12:17:18 2008 -0500
@@ -1,3 +1,7 @@ 2008-02-13  Lillian Angel <langel at redhat
+2008-02-13  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch: Fixed broken JVM location.
+
 2008-02-13  Lillian Angel <langel at redhat.com>
 
 	* NEWS: Updated.
diff -r f8c125bf025b -r 0b96da5cdc36 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Wed Feb 13 11:38:31 2008 -0500
+++ b/patches/icedtea-core-build.patch	Wed Feb 13 12:17:18 2008 -0500
@@ -303,32 +303,34 @@ diff -ru openjdk.orig/jdk/make/common/De
 diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
 --- openjdk.orig/jdk/make/common/Defs-linux.gmk	2007-11-08 11:35:35.000000000 +0000
 +++ openjdk/jdk/make/common/Defs-linux.gmk	2007-11-08 11:36:15.000000000 +0000
-@@ -258,7 +258,11 @@ endif
+@@ -258,7 +258,12 @@ endif
  # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
  # the library itself should not.
  #
 -VM_NAME         = server
-+ifneq ($(wildcard $(LIBDIR)/$(LIBARCH)/server/libjvm.so),)
-+  VM_NAME       = server
-+else
-+  VM_NAME       = core
-+endif
++VM_NAME = $(shell for dir in server client core; do \
++                    if [ -d $(LIBDIR)/$(LIBARCH)/$$dir ]; then \
++		      echo $$dir; \
++		      break; \
++		    fi; \
++		  done)
  JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
  JAVALIB         = -ljava $(JVMLIB)
  
 diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
 --- openjdk.orig/corba/make/common/Defs-linux.gmk	Tue Feb 05 15:52:33 2008 +0000
 +++ openjdk/corba/make/common/Defs-linux.gmk	Mon Feb 11 10:01:46 2008 +0000
-@@ -250,7 +254,11 @@ endif
+@@ -250,7 +254,12 @@ endif
  # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
  # the library itself should not.
  #
 -VM_NAME         = server
-+ifneq ($(wildcard $(BOOTDIR)/jre/lib/$(LIBARCH)/server/libjvm.so),)
-+  VM_NAME       = server
-+else
-+  VM_NAME       = core
-+endif
++VM_NAME = $(shell for dir in server client core; do \
++                    if [ -d $(BOOTDIR)/jre/lib/$(LIBARCH)/$$dir ]; then \
++		      echo $$dir; \
++		      break; \
++		    fi; \
++		  done)
  JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
  JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)