changeset 2451:b36e263a2d9c

PR icedtea/751: Make javah patch conditional so IcedTea7 can bootstrap itself. 2011-07-05 Andrew John Hughes <ahughes@redhat.com> PR icedtea/751: (ICEDTEA_BOOT_PATCHES): Make application of javah.patch dependent on javah presenting with bug 40188.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 07 Jul 2011 13:10:27 +0100
parents 91be8105cfa7
children dd5dc6567d11
files ChangeLog Makefile.am
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 05 13:48:51 2011 +0100
+++ b/ChangeLog	Thu Jul 07 13:10:27 2011 +0100
@@ -1,3 +1,10 @@
+2011-07-05  Andrew John Hughes  <ahughes@redhat.com>
+
+	PR icedtea/751:
+	(ICEDTEA_BOOT_PATCHES): Make application of
+	javah.patch dependent on javah presenting
+	with bug 40188.
+
 2011-07-05  Andrew John Hughes  <ahughes@redhat.com>
 
 	PR icedtea/751
--- a/Makefile.am	Tue Jul 05 13:48:51 2011 +0100
+++ b/Makefile.am	Thu Jul 07 13:10:27 2011 +0100
@@ -345,7 +345,6 @@
 	patches/boot/xbootclasspath.patch \
 	patches/boot/icedteart.patch \
 	patches/boot/jar.patch \
-	patches/boot/javah.patch \
 	patches/boot/symbols.patch \
 	patches/boot/tobin.patch \
 	patches/boot/test_gamma.patch \
@@ -373,7 +372,8 @@
 endif
 
 if CP40188_JAVAH
-ICEDTEA_BOOT_PATCHES += patches/boot/pr40188.patch
+ICEDTEA_BOOT_PATCHES += patches/boot/pr40188.patch \
+	patches/boot/javah.patch
 endif
 
 if CP40616