RFC: Always apply PR600 patch

Dr Andrew John Hughes ahughes at redhat.com
Wed Feb 23 11:41:17 PST 2011


As discussed on IRC:

<xranby-home> gnu_andrew: is there a easy way to apply the patches/cacao/arm-jvm.cfg-pr600.patch for both CACAO and JAMVM builds?
<xranby-home> is it possible to write in Makefile.am    if CACAO_BUILD || JAMVM_BUILD \ ICEDTEA_PATCHES += \ atches/cacao/arm-jvm.cfg-pr600.patch 
<xranby-home> ?
<xranby-home> the easiest way are to unconditionally apply the patch for all builds
<gnu_andrew> xranby-home, yeah I was just thinking that
<gnu_andrew> xranby-home, but will it hurt zero builds?
<gnu_andrew> or shark?
<xranby-home> no zero and shark jave its jvm.cfg in the zero dir
<xranby-home> have
<xranby-home> so i think they will be fine
<gnu_andrew> xranby-home, then I see no problem just applying it always
<gnu_andrew> xranby-home, and gets more testing then anyway
<xranby-home> gnu_andrew: im not in a possition to commit any patches since i am 30kilometers from my commit keys ;) 
<xranby-home> but i can review a patch if you make one
<gnu_andrew> xranby-home, haha ok hang on

Moving the PR600 patch to the main set of IcedTea patches allows the patch to cover both JamVM and CACAO,
and also means it's application is tested by everyone's builds.

ChangeLog:

2011-02-23  Andrew John Hughes  <ahughes at redhat.com>

	* Makefile.am:
	Move PR600 patch to main patch set (so it
	is always applied) to cover both JamVM and
	CACAO.

Ok Xerces?
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37
-------------- next part --------------
diff -r a597500577ef Makefile.am
--- a/Makefile.am	Wed Feb 23 18:38:54 2011 +0000
+++ b/Makefile.am	Wed Feb 23 19:38:50 2011 +0000
@@ -324,7 +324,8 @@
 	patches/jtreg-LastErrorString.patch \
 	patches/openjdk/6663040-com.sun.awt.patch \
 	patches/openjdk/6775317-non-AA-simple-shape-performance.patch \
-	patches/openjdk/6766342-AA-simple-shape-performance.patch
+	patches/openjdk/6766342-AA-simple-shape-performance.patch \
+	patches/cacao/arm-jvm.cfg-pr600.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
@@ -343,8 +344,7 @@
 	patches/cacao/launcher.patch \
 	patches/cacao/arm-arch-defines.patch \
 	patches/cacao/jsig.patch \
-	patches/cacao/memory.patch \
-	patches/cacao/arm-jvm.cfg-pr600.patch
+	patches/cacao/memory.patch
 endif
 
 if ENABLE_CACAO


More information about the distro-pkg-dev mailing list