/hg/icedtea6: 2009-12-03 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset bc6d4b57cacf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bc6d4b57cacf
author: Gary Benson <gbenson at redhat.com>
date: Thu Dec 03 15:58:48 2009 +0000

	2009-12-03 Gary Benson <gbenson at redhat.com>

	 * patches/icedtea-core-build.patch: Remove a very old
	workaround.


diffstat:

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

diffs (53 lines):

diff -r 8c38c97e3ce8 -r bc6d4b57cacf ChangeLog
--- a/ChangeLog	Thu Dec 03 13:49:45 2009 +0000
+++ b/ChangeLog	Thu Dec 03 15:58:48 2009 +0000
@@ -1,3 +1,7 @@ 2009-12-03  Gary Benson  <gbenson at redhat
+2009-12-03  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch: Remove a very old workaround.
+
 2009-12-03  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-bytecodeInterpreter.patch: Removed.
diff -r 8c38c97e3ce8 -r bc6d4b57cacf patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Thu Dec 03 13:49:45 2009 +0000
+++ b/patches/icedtea-core-build.patch	Thu Dec 03 15:58:48 2009 +0000
@@ -44,38 +44,3 @@ diff -ru openjdk.orig/jdk/make/java/redi
  
  #  NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
  
-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,12 @@ endif
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
- # the library itself should not.
- #
--VM_NAME         = server
-+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,12 @@ endif
- # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
- # the library itself should not.
- #
--VM_NAME         = server
-+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)
- 
-