changeset in /hg/icedtea: Update icedtea-copy-plugs patch for b26.

[gnu_andrew at member.fsf.org]

changeset cfc6ab82a538 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cfc6ab82a538
description:
	Update icedtea-copy-plugs patch for b26.

diffstat:

4 files changed, 58 insertions(+), 10 deletions(-)
ChangeLog                        |   22 ++++++++++++++++++++++
Makefile.am                      |   19 ++++++++++++++++---
Makefile.in                      |   17 +++++++++++++++--
patches/icedtea-copy-plugs.patch |   10 +++++-----

diffs (128 lines):

diff -r a5623b3737c3 -r cfc6ab82a538 ChangeLog
--- a/ChangeLog	Fri May 23 19:55:07 2008 +0100
+++ b/ChangeLog	Fri May 23 20:44:43 2008 +0100
@@ -1,3 +1,25 @@ 2008-05-15  Matthias Klose  <doko at ubuntu
+2008-05-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am: Add support for reverting
+	OpenJDK patches.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-copy-plugs.patch: Updated
+	for OpenJDK7 b26.
+	
+2008-05-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am: Add support for using
+	OpenJDK patches (diffs from non-master
+	repositories)
+	* Makefile.in: Regenerated.
+	
+2008-05-19  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am: Move build back to using
+	OpenJDK Mercurial repository after merge,
+	and upgrade to b26.
+	* Makefile.in: Regenerated.
+	
 2008-05-15  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-sparc.patch: New.
diff -r a5623b3737c3 -r cfc6ab82a538 Makefile.am
--- a/Makefile.am	Fri May 23 19:55:07 2008 +0100
+++ b/Makefile.am	Fri May 23 20:44:43 2008 +0100
@@ -385,13 +385,26 @@ clean-patch:
 clean-patch:
 	rm -f stamps/patch.stamp
 	all_patches_ok=yes; \
-	for p in $(ICEDTEA_PATCHES) ; \
+	cd $(abs_top_builddir)/openjdk/jdk; \
+	for p in $(OPENJDK_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -l -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
+	  else \
+	    all_patches_ok=no ; \
+	  fi ; \
+	done ; \
+	cd $(abs_top_builddir) ; \
+	for p in $(ICEDTEA_PATCHES) ; \
+	do \
+	  echo Checking $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
+	  then \
+	    echo Reverting $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
diff -r a5623b3737c3 -r cfc6ab82a538 Makefile.in
--- a/Makefile.in	Fri May 23 19:55:07 2008 +0100
+++ b/Makefile.in	Fri May 23 20:44:43 2008 +0100
@@ -891,13 +891,26 @@ clean-patch:
 clean-patch:
 	rm -f stamps/patch.stamp
 	all_patches_ok=yes; \
+	cd $(abs_top_builddir)/openjdk/jdk; \
+	for p in $(OPENJDK_PATCHES) ; \
+	do \
+	  echo Checking $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
+	  then \
+	    echo Reverting $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
+	  else \
+	    all_patches_ok=no ; \
+	  fi ; \
+	done ; \
+	cd $(abs_top_builddir) ; \
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -l -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
diff -r a5623b3737c3 -r cfc6ab82a538 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch	Fri May 23 19:55:07 2008 +0100
+++ b/patches/icedtea-copy-plugs.patch	Fri May 23 20:44:43 2008 +0100
@@ -33,8 +33,8 @@ diff -urN openjdk.orig/jdk/src/share/cla
  
                  Type[] paramTypes = constr.getGenericParameterTypes();
                  if (paramTypes.length != propertyNames.length) {
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-28 04:39:40.000000000 -0500
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-29 14:28:47.000000000 -0500
+--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-05-23 20:13:24.000000000 +0100
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-05-23 20:22:20.000000000 +0100
 @@ -51,28 +51,19 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
@@ -117,7 +117,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
  
-@@ -188,9 +206,9 @@
+@@ -183,9 +201,9 @@
  # Import classes command
  
  define import-binary-plug-classes
@@ -128,8 +128,8 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) `$(CAT) $1`)
  endef # import-binary-plug-classes
  
- else # IMPORT_BINARY_PLUGS
-@@ -220,12 +238,21 @@
+ # Import specific area classes (the classes are always created)
+@@ -194,12 +212,21 @@
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
  import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)