Mercurial > hg > release > icedtea-1.10
changeset 807:37613c25c4cf cacao
2008-02-13 Gary Benson <gbenson@redhat.com>
* patches/icedtea-core-build.patch: Fixed broken JVM location.
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Wed, 13 Feb 2008 12:17:18 -0500 |
| parents | cd35e9b3121b |
| children | 41a79208d9a9 |
| files | ChangeLog patches/icedtea-core-build.patch |
| diffstat | 2 files changed, 18 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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 Gary Benson <gbenson@redhat.com> + + * patches/icedtea-core-build.patch: Fixed broken JVM location. + 2008-02-13 Lillian Angel <langel@redhat.com> * NEWS: Updated.
--- 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/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)