changeset in /hg/icedtea: Fix the ordering of patches for the ze...

[Andrew John Hughes]

changeset b27fcf6b288e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b27fcf6b288e
description:
	Fix the ordering of patches for the zero build.

diffstat:

4 files changed, 21 insertions(+), 9 deletions(-)
ChangeLog                                  |   11 +++++++++++
Makefile.am                                |    2 +-
Makefile.in                                |    6 +++---
patches/icedtea-hotspot7-build-fixes.patch |   11 ++++++-----

diffs (86 lines):

diff -r 97bdc8ca2258 -r b27fcf6b288e ChangeLog
--- a/ChangeLog	Wed May 28 10:35:21 2008 +0100
+++ b/ChangeLog	Wed May 28 14:57:48 2008 +0100
@@ -1,3 +1,14 @@ 2008-05-28  Andrew John Hughes  <gnu_and
+2008-05-28  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Apply zero patches at the end, not the start
+	so that the version of vm_version.cpp to which
+	icedtea-core-build.patch applies is known.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-hotspot7-build-fixes.patch:
+	Regenerated against the version of vm_version.cpp
+	modified by icedtea-core-build.patch.
+	
 2008-05-28  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 97bdc8ca2258 -r b27fcf6b288e Makefile.am
--- a/Makefile.am	Wed May 28 10:35:21 2008 +0100
+++ b/Makefile.am	Wed May 28 14:57:48 2008 +0100
@@ -291,7 +291,6 @@ endif
 endif
 
 ICEDTEA_PATCHES = \
-	$(ZERO_PATCHES_COND) \
 	patches/icedtea-copy-plugs.patch \
 	patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
@@ -338,6 +337,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-hat-spl-gpl.patch \
 	patches/icedtea-sparc.patch \
+	$(ZERO_PATCHES_COND) \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) \
 	patches/icedtea-xslfix.patch \
diff -r 97bdc8ca2258 -r b27fcf6b288e Makefile.in
--- a/Makefile.in	Wed May 28 10:35:21 2008 +0100
+++ b/Makefile.in	Wed May 28 14:57:48 2008 +0100
@@ -383,8 +383,8 @@ ZERO_PATCHES = \
 
 @ZERO_BUILD_FALSE at ZERO_PATCHES_COND = 
 @ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
-ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
-	patches/icedtea-copy-plugs.patch patches/icedtea-version.patch \
+ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
+	patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
 	patches/icedtea-graphics.patch patches/icedtea-debuginfo.patch \
 	patches/icedtea-ssl.patch \
@@ -418,7 +418,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
-	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
+	$(ZERO_PATCHES_COND) $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
 	patches/icedtea-xslfix.patch patches/icedtea-override.patch \
 	$(am__append_7)
 
diff -r 97bdc8ca2258 -r b27fcf6b288e patches/icedtea-hotspot7-build-fixes.patch
--- a/patches/icedtea-hotspot7-build-fixes.patch	Wed May 28 10:35:21 2008 +0100
+++ b/patches/icedtea-hotspot7-build-fixes.patch	Wed May 28 14:57:48 2008 +0100
@@ -1,7 +1,7 @@ diff -Nru openjdk.orig/hotspot/src/share
 diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2008-05-27 00:56:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-05-27 20:14:16.000000000 +0100
-@@ -88,16 +88,12 @@
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2008-05-27 22:41:12.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-05-28 11:58:57.000000000 +0100
+@@ -88,9 +88,6 @@
    #define VMLP ""
  #endif
  
@@ -11,8 +11,9 @@ diff -Nru openjdk.orig/hotspot/src/share
  #ifdef TIERED
    #define VMTYPE "Server"
  #else
-   #define VMTYPE COMPILER1_PRESENT("Client")   \
-                  COMPILER2_PRESENT("Server")
+@@ -101,7 +98,6 @@
+   #define VMTYPE "Core"
+ #endif // COMPILER1 || COMPILER2
  #endif // TIERED
 -#endif // KERNEL