diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-19 06:57:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-19 06:57:15 +0000 |
| commit | c350e68ffea905f53618f4641e65ffc32136f99d (patch) | |
| tree | 707dbb1ecc968b138549606db8c0b67d0a398275 /sys-apps/texinfo | |
| parent | Mark amd64 stable #214428. (diff) | |
| download | gentoo-2-c350e68ffea905f53618f4641e65ffc32136f99d.tar.gz gentoo-2-c350e68ffea905f53618f4641e65ffc32136f99d.tar.bz2 gentoo-2-c350e68ffea905f53618f4641e65ffc32136f99d.zip | |
Add fix from upstream for parallel build issues #214127 by Michael Haubenwallner.
(Portage version: 2.2_pre5)
Diffstat (limited to 'sys-apps/texinfo')
| -rw-r--r-- | sys-apps/texinfo/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch | 21 | ||||
| -rw-r--r-- | sys-apps/texinfo/texinfo-4.11-r1.ebuild | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog index a64ca6f94272..139c211f7cb6 100644 --- a/sys-apps/texinfo/ChangeLog +++ b/sys-apps/texinfo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/texinfo # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.97 2008/04/19 06:53:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.98 2008/04/19 06:57:14 vapier Exp $ + + 19 Apr 2008; Mike Frysinger <vapier@gentoo.org> + +files/texinfo-4.11-parallel-build.patch, texinfo-4.11-r1.ebuild: + Add fix from upstream for parallel build issues #214127 by Michael + Haubenwallner. 19 Apr 2008; Mike Frysinger <vapier@gentoo.org> texinfo-4.11-r1.ebuild: Mark amd64 stable #214428. diff --git a/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch b/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch new file mode 100644 index 000000000000..ef8ad7deeb97 --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.11-parallel-build.patch @@ -0,0 +1,21 @@ +Index: info/Makefile.am +=================================================================== +RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v +retrieving revision 1.14 +retrieving revision 1.15 +diff -u -p -r1.14 -r1.15 +--- info/Makefile.in 15 Dec 2007 14:32:51 -0000 1.14 ++++ info/Makefile.in 28 Mar 2008 23:39:20 -0000 1.15 +@@ -70,8 +70,10 @@ cmd_sources = $(srcdir)/session.c $(srcd + $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \ + $(srcdir)/footnotes.c $(srcdir)/variables.c + +-# The $(EXEEXT) should be added by Automake, but isn't. Fine. +-$(generated_sources): makedoc$(EXEEXT) $(cmd_sources) ++# Make the target only funs.h even though we create all the ++# $(generated_sources) so that parallel makes won't do the rm && makedoc ++# more than once. ++funs.h: makedoc$(EXEEXT) $(cmd_sources) + rm -f $(generated_sources) + $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) + diff --git a/sys-apps/texinfo/texinfo-4.11-r1.ebuild b/sys-apps/texinfo/texinfo-4.11-r1.ebuild index 1e8c25722b09..5049bf27c9fa 100644 --- a/sys-apps/texinfo/texinfo-4.11-r1.ebuild +++ b/sys-apps/texinfo/texinfo-4.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.11-r1.ebuild,v 1.11 2008/04/19 06:53:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.11-r1.ebuild,v 1.12 2008/04/19 06:57:14 vapier Exp $ inherit flag-o-matic @@ -27,6 +27,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-dir-entry.patch #198545 epatch "${FILESDIR}"/${P}-test-tex.patch #195313 epatch "${FILESDIR}"/${P}-test.patch #215359 + epatch "${FILESDIR}"/${P}-parallel-build.patch #214127 # FreeBSD requires install-sh, but usptream don't have it marked # exec, #195076 |