/hg/icedtea6: Apply icedtea-shark-build.patch for both HotSpots ...

[andrew at icedtea.classpath.org]

changeset 2fa7aed828ed in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2fa7aed828ed
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 20 20:48:54 2010 +0100

	Apply icedtea-shark-build.patch for both HotSpots (top-level patch).

	2010-09-20 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Enable icedtea-shark-build.patch on
	all builds as it applies to the top-level makefiles and not
	HotSpot.


diffstat:

2 files changed, 9 insertions(+), 2 deletions(-)
ChangeLog   |    7 +++++++
Makefile.am |    4 ++--

diffs (32 lines):

diff -r e470c7b5f2dc -r 2fa7aed828ed ChangeLog
--- a/ChangeLog	Mon Sep 20 00:18:57 2010 +0100
+++ b/ChangeLog	Mon Sep 20 20:48:54 2010 +0100
@@ -1,3 +1,10 @@ 2010-09-19  Andrew John Hughes  <ahughes
+2010-09-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Enable icedtea-shark-build.patch on all builds
+	as it applies to the top-level makefiles and not
+	HotSpot.
+
 2010-09-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r e470c7b5f2dc -r 2fa7aed828ed Makefile.am
--- a/Makefile.am	Mon Sep 20 00:18:57 2010 +0100
+++ b/Makefile.am	Mon Sep 20 20:48:54 2010 +0100
@@ -290,12 +290,12 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6510892-httpserver_test.patch \
 	patches/openjdk/6638712-wildcard_types.patch \
 	patches/openjdk/6650759-missing_inference.patch \
-	patches/numa_on_early_glibc.patch
+	patches/numa_on_early_glibc.patch \
+	patches/icedtea-shark-build.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/shark_do_nothing_on_stub_frame.patch \
-	patches/icedtea-shark-build.patch \
 	patches/icedtea-shark-build-hotspot.patch \
 	patches/shark.patch \
 	patches/shark-debug-option.patch \