/hg/icedtea6: Fix build breakage on hs19 caused by previous chan...

[omajid at icedtea.classpath.org]

changeset 97a8f2681254 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=97a8f2681254
author: Omair Majid <omajid at redhat.com>
date: Mon Mar 07 15:17:27 2011 -0500

	Fix build breakage on hs19 caused by previous changeset

	2011-03-07 Omair Majid <omajid at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Apply patches/jtreg-remove-
	test-6987555.patch and patches/jtreg-remove-test-6991596.patch
	only on ALT_HSBUILD.


diffstat:

 ChangeLog   |  6 ++++++
 Makefile.am |  8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 115b18bbcedb -r 97a8f2681254 ChangeLog
--- a/ChangeLog	Mon Mar 07 18:49:08 2011 +0100
+++ b/ChangeLog	Mon Mar 07 15:17:27 2011 -0500
@@ -1,3 +1,9 @@
+2011-03-07  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Apply
+	patches/jtreg-remove-test-6987555.patch and
+	patches/jtreg-remove-test-6991596.patch only on ALT_HSBUILD.
+
 2011-03-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Added two new patches.
diff -r 115b18bbcedb -r 97a8f2681254 Makefile.am
--- a/Makefile.am	Mon Mar 07 18:49:08 2011 +0100
+++ b/Makefile.am	Mon Mar 07 15:17:27 2011 -0500
@@ -324,14 +324,14 @@
 	patches/openjdk/6766342-AA-simple-shape-performance.patch \
 	patches/openjdk/7016856-pisces-performance.patch \
 	patches/openjdk/6934977-MappedByteBuffer.load.patch \
-	patches/jaxp-serial-version-uid.patch \
-	patches/jtreg-remove-test-6987555.patch \
-	patches/jtreg-remove-test-6991596.patch
+	patches/jaxp-serial-version-uid.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/pr639-broken_shark_build.patch \
-	patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch
+	patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch \
+	patches/jtreg-remove-test-6987555.patch \
+	patches/jtreg-remove-test-6991596.patch
 else
 ICEDTEA_PATCHES += \
 	patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \