/hg/icedtea6: Replace rmi_amd64.patch with upstream's improved fix

[omajid at icedtea.classpath.org]

changeset 57518374feba in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=57518374feba
author: Omair Majid <omajid at redhat.com>
date: Thu May 12 13:28:05 2011 -0400

	Replace rmi_amd64.patch with upstream's improved fix

	Upstream applied an improved version of the fix which also addressed
	duplicate binaries on solaris-64. Replace our custom patch with
	upstream's fix.

	2011-05-12 Omair Majid <omajid at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add
	7043921-java_rmi_cgi.patch
	       * patches/openjdk/7043921-java_rmi_cgi.patch: New file.
	       * patches/rmi_amd64.patch: Remove.


diffstat:

 ChangeLog                                  |   7 +++++
 Makefile.am                                |   2 +-
 patches/openjdk/7043921-java_rmi_cgi.patch |  39 ++++++++++++++++++++++++++++++
 patches/rmi_amd64.patch                    |  14 ----------
 4 files changed, 47 insertions(+), 15 deletions(-)

diffs (89 lines):

diff -r 0dad4d8420ac -r 57518374feba ChangeLog
--- a/ChangeLog	Thu May 12 11:22:12 2011 -0400
+++ b/ChangeLog	Thu May 12 13:28:05 2011 -0400
@@ -1,3 +1,10 @@
+2011-05-12  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add
+	7043921-java_rmi_cgi.patch
+	* patches/openjdk/7043921-java_rmi_cgi.patch: New file.
+	* patches/rmi_amd64.patch: Remove.
+
 2011-05-12  Omair Majid  <omajid at redhat.com>
 
 	* Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch with
diff -r 0dad4d8420ac -r 57518374feba Makefile.am
--- a/Makefile.am	Thu May 12 11:22:12 2011 -0400
+++ b/Makefile.am	Thu May 12 13:28:05 2011 -0400
@@ -217,7 +217,7 @@
 	patches/version.patch \
 	patches/version-hotspot.patch \
 	patches/hotspot/$(HSBUILD)/text-relocations.patch \
-	patches/rmi_amd64.patch \
+	patches/openjdk/7043921-java_rmi_cgi.patch \
 	patches/tools.patch \
 	patches/use-system-tzdata.patch \
 	patches/headers.patch \
diff -r 0dad4d8420ac -r 57518374feba patches/openjdk/7043921-java_rmi_cgi.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7043921-java_rmi_cgi.patch	Thu May 12 13:28:05 2011 -0400
@@ -0,0 +1,40 @@
+# HG changeset patch
+# User ohair
+# Date 1305210277 25200
+# Node ID 13fa9a0c628f58326cc376b7623a03b9d796136e
+# Parent  caed82420c5d01f5aaee5b15e8e37befc8db3d49
+7043921: generate java-rmi.cgi on 64 bit platform
+Reviewed-by: omajid, katleman
+
+diff -r caed82420c5d -r 13fa9a0c628f make/sun/rmi/rmi/Makefile
+--- openjdk/jdk/make/sun/rmi/rmi/Makefile	Wed May 11 14:12:50 2011 -0700
++++ openjdk/jdk/make/sun/rmi/rmi/Makefile	Thu May 12 07:24:37 2011 -0700
+@@ -85,16 +85,21 @@
+ 	sun.rmi.registry.RegistryImpl \
+ 	sun.rmi.transport.DGCImpl
+ 
+-ifeq ($(PLATFORM), windows)
+-build: stubs
+-else # PLATFORM
+-ifneq ($(ARCH_DATA_MODEL), 32)
+-build: stubs
+-else # ARCH_DATA_MODEL
+-build: stubs bin
++#
++# The java-rmi.cgi script in bin/ only gets delivered in certain situations
++#
++BUILD_TARGETS = stubs
++ifeq ($(PLATFORM), linux)
++  BUILD_TARGETS += bin
+ endif
++ifeq ($(PLATFORM), solaris)
++  ifeq ($(ARCH_DATA_MODEL), 32)
++    BUILD_TARGETS += bin
++  endif
+ endif
+ 
++build: $(BUILD_TARGETS)
++
+ clean clobber:: bin.clean
+ 
+ 
diff -r 0dad4d8420ac -r 57518374feba patches/rmi_amd64.patch
--- a/patches/rmi_amd64.patch	Thu May 12 11:22:12 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- ../openjdk/jdk/make/sun/rmi/rmi/Makefile	2007-08-16 03:17:52.000000000 -0400
-+++ openjdk/jdk/make/sun/rmi/rmi/Makefile	2007-08-30 12:36:07.000000000 -0400
-@@ -88,12 +88,8 @@
- ifeq ($(PLATFORM), windows)
- build: stubs
- else # PLATFORM
--ifneq ($(ARCH_DATA_MODEL), 32)
--build: stubs
--else # ARCH_DATA_MODEL
- build: stubs bin
- endif
--endif
- 
- clean clobber:: bin.clean
-