diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-12-08 05:24:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-12-08 05:24:48 +0000 |
| commit | 57861481056b6ddf6b4a6b05b2a9a55470224d55 (patch) | |
| tree | d3e08acb5c154a2289f582ee6a1eb1fd075e3dc7 | |
| parent | old (diff) | |
| download | gentoo-2-57861481056b6ddf6b4a6b05b2a9a55470224d55.tar.gz gentoo-2-57861481056b6ddf6b4a6b05b2a9a55470224d55.tar.bz2 gentoo-2-57861481056b6ddf6b4a6b05b2a9a55470224d55.zip | |
Fix parallel build failure with docs #249153 by Stefaan De Roeck.
(Portage version: 2.2_rc17/cvs/Linux 2.6.27.8 x86_64)
| -rw-r--r-- | dev-libs/zziplib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch | 35 | ||||
| -rw-r--r-- | dev-libs/zziplib/zziplib-0.13.49-r1.ebuild | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog index 15f2e9df7de5..8bf72de7c026 100644 --- a/dev-libs/zziplib/ChangeLog +++ b/dev-libs/zziplib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/zziplib # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.51 2008/11/17 22:34:49 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.52 2008/12/08 05:24:48 vapier Exp $ + + 08 Dec 2008; Mike Frysinger <vapier@gentoo.org> + +files/zziplib-0.13.49-parallel-docs.patch, zziplib-0.13.49-r1.ebuild: + Fix parallel build failure with docs #249153 by Stefaan De Roeck. 17 Nov 2008; Friedrich Oslage <bluebird@gentoo.org> +files/zziplib-0.13.49-sparc-aligned-access.patch, diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch b/dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch new file mode 100644 index 000000000000..5582985f5086 --- /dev/null +++ b/dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch @@ -0,0 +1,35 @@ +fix parallel build with docs + +http://bugs.gentoo.org/249153 +http://sourceforge.net/tracker/index.php?func=detail&aid=2405440&group_id=6389&atid=306389 + +--- zziplib-0.13.49/docs/Makefile.in ++++ zziplib-0.13.49/docs/Makefile.in +@@ -447,21 +447,24 @@ docu : + - rm zziplib2.html zzipmmapped.html zzipfseeko.html + $(MAKE) manpages.ar htmpages.ar DELETE=exit + +-zziplib.html zziplib.xml : zziplib.spec $(srcdir)/Makefile.am \ ++zziplib.xml: zziplib.html ++zziplib.html: zziplib.spec $(srcdir)/Makefile.am \ + $(srcdir)/zzipdoc/*.py \ + $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c + $(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \ + "--package=$(PACKAGE)" "--version=$(VERSION)" \ + "--onlymainheader=zzip/lib.h" "--output=zziplib" + test -s zziplib.docbook && mv zziplib.docbook zziplib.xml +-zzipmmapped.html zzipmmapped.xml : zziplib.spec $(srcdir)/Makefile.am \ ++zzipmmapped.xml: zzipmmapped.html ++zzipmmapped.html: zziplib.spec $(srcdir)/Makefile.am \ + $(srcdir)/zzipdoc/*.py \ + $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c + $(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \ + "--package=$(PACKAGE)" "--version=$(VERSION)" \ + "--onlymainheader=zzip/mmapped.h" "--output=zzipmmapped" + test -s zzipmmapped.docbook && mv zzipmmapped.docbook zzipmmapped.xml +-zzipfseeko.html zzipfseeko.xml : zziplib.spec $(srcdir)/Makefile.am \ ++zzipfseeko.xml: zzipfseeko.html ++zzipfseeko.html: zziplib.spec $(srcdir)/Makefile.am \ + $(srcdir)/zzipdoc/*.py \ + $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c + $(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \ diff --git a/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild index be1e74b0a7b0..497253c2c6bc 100644 --- a/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild +++ b/dev-libs/zziplib/zziplib-0.13.49-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/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild,v 1.5 2008/11/17 22:34:49 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild,v 1.6 2008/12/08 05:24:48 vapier Exp $ inherit libtool fixheadtails eutils @@ -23,6 +23,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-parallel-docs.patch #249153 epatch "${FILESDIR}"/${P}-python.patch epatch "${FILESDIR}"/${P}-configure-sed.patch #240556 epatch "${FILESDIR}"/${P}-SDL-test.patch |