Add patch from upstream to fix testsuite w/ gcc-4.5.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 35 insertions, 4 deletions

diff --git a/sys-devel/bison/ChangeLog b/sys-devel/bison/ChangeLog
index 546523f076f7..6983c97e30ee 100644
--- a/sys-devel/bison/ChangeLog
+++ b/sys-devel/bison/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/bison
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.84 2010/04/16 13:43:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.85 2010/04/22 06:07:29 dirtyepic Exp $
+
+  22 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> bison-2.4.2.ebuild,
+  +files/bison-2.4.2-gcc45_testsuite.patch:
+  Add patch from upstream to fix testsuite w/ gcc-4.5.
 
   16 Apr 2010; Brent Baude <ranger@gentoo.org> bison-2.4.1.ebuild:
   stable ppc, bug 311867
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index ad666619a935..e2d6f5f1972b 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bison-1.32-extfix.patch 1170 RMD160 41daa5ee80712e419a15233af15efbd174ac1adf SHA1 a7cab61f53ca9d9d97b99c8687df1f092e1c1dbc SHA256 a47285e1b6f1ee53b8def53380068ad6a86ccd09e3338481f6d3d14c7e8b31c4
 AUX bison-2.4-compat.patch 5896 RMD160 05f2e2db641baa2b24352e41e07bc116e05499e9 SHA1 98fea4f2a470bd65d0b29001fb35d1632c6156fe SHA256 7228583e34f08e643269161a073aa5e0d3a8157bf8f043ca3ad62542d1cdd425
+AUX bison-2.4.2-gcc45_testsuite.patch 548 RMD160 82bf133d05cea630fd0cf4aadbe754b925957d27 SHA1 a7628394e7b19173885965b9327b37b10d6ea31f SHA256 2483e0b22bccbd7c882f4af16743720f6c2ded4737f180c93270d6249ef92fb9
 AUX bison-2.4.2-gnulib_spawn.patch 2667 RMD160 14cc23973b695702f61cf3c69dc492cb81cb193b SHA1 eeb124b49a9ae10e11cfaa0ec2fc073a80c07ea5 SHA256 3ad044de9d80449859a73d805accc2481c362c5bce6421f7336509f02e1ee39d
 DIST bison-1.875d.tar.bz2 882745 RMD160 37ab2ea1df81021c481625794938dcdacc09e4d2 SHA1 cf17c4f2df1344ee93bcc5c336f691db831d1ab5 SHA256 37ff8d673e35838c195d614bc402573d1268c997796e79b831053f4a22e03808
 DIST bison-2.3.tar.bz2 1080319 RMD160 c6a116d6b763fad3f4df6e303943e09ed080cb26 SHA1 7e489f35c6d8171f0cb0cad3dda0fb39f2cb0b62 SHA256 b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb
@@ -10,6 +14,13 @@ EBUILD bison-1.875d.ebuild 1782 RMD160 115959d78930a7c4638a16bee4eb48d7e1a92a0a
 EBUILD bison-2.3.ebuild 1070 RMD160 262d2d880834c4c24d86c7494abeb7ce1d363765 SHA1 3c17f2e23a60f63163bbb42ed018c8efa3c6ed9a SHA256 b761b01f372481b62c509f19f290d0be1993cba741e840b92757aebdcb7bfe36
 EBUILD bison-2.4-r1.ebuild 1418 RMD160 8860f76bbb96bc7ff32f539e59d9a75d1dbfaa98 SHA1 c801623fb7f32757d3152e86959a364799662d31 SHA256 9a3d9dc946e58521acbe13edd757835e717890c90c778b79b59f6956b7ef8cdb
 EBUILD bison-2.4.1.ebuild 1125 RMD160 a25b9945e2cd9a64a7a9daec21acba71e3f22578 SHA1 080dfff1ede7e910212f61abcb805e11722f15c9 SHA256 35d2fbca3af6af82239a53888809eec9949239a90aabf489e47ea6659dc4ff3c
-EBUILD bison-2.4.2.ebuild 1235 RMD160 0806736821d0d32ae7fe240f9eb3623cc635e587 SHA1 c30fa90058f2f5ff0f2e2de2f0cd019d6990cd76 SHA256 b7689f87732960876eae0756c395a25fc5fdac0bcdf7e0334accda61aff7c708
-MISC ChangeLog 11444 RMD160 6e155e20344a0eff4c3d09ca5fa3af96a7f68d3f SHA1 19fa1de89651f6275ef8d9f06c7d7583238cf56b SHA256 d69bc4852e38ea0cfa15e416d24cd20b0ddec167df320a37a25888628383158c
+EBUILD bison-2.4.2.ebuild 1292 RMD160 9678b5c0bb717c1fb29c8224dacca0760db412b1 SHA1 2109dd35d179e1ace5157e5382e6f652c955f400 SHA256 5075579aadf1812d894fe730e60e8aa04cac24e3f29fe117cad34ae61ce6fc4c
+MISC ChangeLog 11615 RMD160 316ce97995a780ab9eb076cf119cf69e496cf4ba SHA1 96a3e284b2a00fa643a65c2aef6d8c96a17145c0 SHA256 4ca37e62ee4a431e33abc1548cfda072a9e1b4f4a651021971977853993ac3c2
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvP6FsACgkQiqiDRvmkBmInbQCgqvoOcD1tR4I9qcsM5xCuFebE
+GsoAn2tX000XMwrUdXzdfN4xIDQ2LrBE
+=1p23
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/bison/bison-2.4.2.ebuild b/sys-devel/bison/bison-2.4.2.ebuild
index 981214b7b271..aae4bdac0b12 100644
--- a/sys-devel/bison/bison-2.4.2.ebuild
+++ b/sys-devel/bison/bison-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.4.2.ebuild,v 1.2 2010/04/04 20:01:31 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.4.2.ebuild,v 1.3 2010/04/22 06:07:29 dirtyepic Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.4.2-gnulib_spawn.patch # 312697
+	epatch "${FILESDIR}"/${PN}-2.4.2-gcc45_testsuite.patch
 }
 
 src_compile() {
diff --git a/sys-devel/bison/files/bison-2.4.2-gcc45_testsuite.patch b/sys-devel/bison/files/bison-2.4.2-gcc45_testsuite.patch
new file mode 100644
index 000000000000..d0fbd8147650
--- /dev/null
+++ b/sys-devel/bison/files/bison-2.4.2-gcc45_testsuite.patch
@@ -0,0 +1,15 @@
+http://git.savannah.gnu.org/cgit/bison.git/commit/?id=4ad3921d3be296de6a2b3c5fe0e18136d53ba06d
+
+--- a/tests/synclines.at
++++ b/tests/synclines.at
+@@ -71,7 +71,9 @@ AT_CHECK([[test "`cat stdout`" = 'syncline.c:1: @%:@error "1"' || exit 77]])
+ AT_DATA([[input.y]], [$2])
+ AT_BISON_CHECK([-o input.c input.y])
+ AT_SYNCLINES_COMPILE([input.c])
+-AT_CHECK([cat stdout], 0, [$3])
++# GCC 4.5 tells you the function within which #error appears, but
++# previous versions of gcc do not.
++AT_CHECK([grep -v ': In function ' stdout], 0, [$3])
+ AT_CLEANUP
+ ])
+