diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-03-21 11:42:55 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-03-21 11:42:55 +0000 |
| commit | 59474cdb0aa2eab505143187cb5dae591d45fd2a (patch) | |
| tree | ad32842315190bfaa735b8c0b410bf1b5a0a1638 /sys-devel/automake | |
| parent | Fix by Ryan Hill for tests w/libtool-2 #257544. (diff) | |
| download | gentoo-2-59474cdb0aa2eab505143187cb5dae591d45fd2a.tar.gz gentoo-2-59474cdb0aa2eab505143187cb5dae591d45fd2a.tar.bz2 gentoo-2-59474cdb0aa2eab505143187cb5dae591d45fd2a.zip | |
Fix from upstream for running tests under bash-4 #263068 by Nick Fortino.
(Portage version: 2.2_rc26/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/automake')
| -rw-r--r-- | sys-devel/automake/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/automake/automake-1.10.2.ebuild | 3 | ||||
| -rw-r--r-- | sys-devel/automake/files/automake-1.10.2-bash4.patch | 22 |
3 files changed, 29 insertions, 2 deletions
diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog index fd882a1535a8..4c42d1482754 100644 --- a/sys-devel/automake/ChangeLog +++ b/sys-devel/automake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/automake # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.132 2009/03/21 11:40:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.133 2009/03/21 11:42:54 vapier Exp $ + + 21 Mar 2009; Mike Frysinger <vapier@gentoo.org> + +files/automake-1.10.2-bash4.patch, automake-1.10.2.ebuild: + Fix from upstream for running tests under bash-4 #263068 by Nick Fortino. 21 Mar 2009; Mike Frysinger <vapier@gentoo.org> +files/automake-1.7.9-libtool-2.patch, automake-1.7.9-r1.ebuild: diff --git a/sys-devel/automake/automake-1.10.2.ebuild b/sys-devel/automake/automake-1.10.2.ebuild index c4f2aef34611..fa397c86e77c 100644 --- a/sys-devel/automake/automake-1.10.2.ebuild +++ b/sys-devel/automake/automake-1.10.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.2.ebuild,v 1.8 2009/02/08 19:42:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.2.ebuild,v 1.9 2009/03/21 11:42:54 vapier Exp $ inherit eutils @@ -33,6 +33,7 @@ src_unpack() { -e "s:automake.info:automake${SLOT}.info:" \ -e "s:automake.texi:automake${SLOT}.texi:" \ doc/Makefile.in || die "sed on Makefile.in failed" + epatch "${FILESDIR}"/${P}-bash4.patch #263068 export WANT_AUTOCONF=2.5 } diff --git a/sys-devel/automake/files/automake-1.10.2-bash4.patch b/sys-devel/automake/files/automake-1.10.2-bash4.patch new file mode 100644 index 000000000000..01829ce1741e --- /dev/null +++ b/sys-devel/automake/files/automake-1.10.2-bash4.patch @@ -0,0 +1,22 @@ +An upstream patch to fix ksh test issues, which also affect bash 4.0 + +http://bugs.gentoo.org/263068 +http://git.savannah.gnu.org/cgit/automake.git/commit/?h=branch-1-10&id=319305db77dfdcbba3d5a1703c781750affdb20a + +2008-12-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + Testsuite fix for ksh. + * tests/check10.test: Add ':' as last command in subshell, for + zero exit status of the subshell. + Missing backport from master reported by Tim Rice. + +--- a/tests/check10.test ++++ b/tests/check10.test +@@ -72,6 +72,7 @@ + env TESTS="xpass xpass2" $MAKE -e check + env TESTS='pass skip xfail' $MAKE -e check + $MAKE check ++ : + ) >stdout + cat stdout + |