diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-11-14 09:15:30 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-11-14 09:15:30 +0000 |
| commit | 6d39b1ea1d90f6306a14d1823eac97e968c0c9e0 (patch) | |
| tree | 62e01a7f4108f0b10dc7cc2999d983b739703b92 /media-gfx/sam2p | |
| parent | Require libX11 built with USE=-xcb. (diff) | |
| download | gentoo-2-6d39b1ea1d90f6306a14d1823eac97e968c0c9e0.tar.gz gentoo-2-6d39b1ea1d90f6306a14d1823eac97e968c0c9e0.tar.bz2 gentoo-2-6d39b1ea1d90f6306a14d1823eac97e968c0c9e0.zip | |
fix build with distcc instead of disabling it, by David Leverton <levertond@googlemail.com>, bug #245333
(Portage version: 2.2_rc14/cvs/Linux 2.6.27.5 x86_64)
Diffstat (limited to 'media-gfx/sam2p')
| -rw-r--r-- | media-gfx/sam2p/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/sam2p/files/sam2p-0.45-distcc.patch | 10 | ||||
| -rw-r--r-- | media-gfx/sam2p/sam2p-0.45-r1.ebuild | 5 |
3 files changed, 18 insertions, 4 deletions
diff --git a/media-gfx/sam2p/ChangeLog b/media-gfx/sam2p/ChangeLog index 925369dc0409..a53d9dfbc91b 100644 --- a/media-gfx/sam2p/ChangeLog +++ b/media-gfx/sam2p/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/sam2p # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.32 2008/10/07 06:02:21 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.33 2008/11/14 09:15:30 aballier Exp $ + + 14 Nov 2008; Alexis Ballier <aballier@gentoo.org> + +files/sam2p-0.45-distcc.patch, sam2p-0.45-r1.ebuild: + fix build with distcc instead of disabling it, by David Leverton + <levertond@googlemail.com>, bug #245333 07 Oct 2008; Zac Medico <zmedico@gentoo.org> sam2p-0.45-r1.ebuild: Bug #239671 - Fix the distcc workaround so it also works when ccache is diff --git a/media-gfx/sam2p/files/sam2p-0.45-distcc.patch b/media-gfx/sam2p/files/sam2p-0.45-distcc.patch new file mode 100644 index 000000000000..b99fb95ed292 --- /dev/null +++ b/media-gfx/sam2p/files/sam2p-0.45-distcc.patch @@ -0,0 +1,10 @@ +--- sam2p-0.45/ccdep.pl~ 2005-01-06 09:59:39.000000000 +0000 ++++ sam2p-0.45/ccdep.pl 2008-11-02 22:16:57.000000000 +0000 +@@ -224,6 +224,7 @@ + } elsif ($S=~/: No such file or directory$/) { + # ^^^ gcc-3.3 + undef $included_from; ++ } elsif ($S=~/^distcc\[/) { + } else { + die "$0: invalid depret: [$S]\n"; + } diff --git a/media-gfx/sam2p/sam2p-0.45-r1.ebuild b/media-gfx/sam2p/sam2p-0.45-r1.ebuild index edb0167b6627..f911c161b04e 100644 --- a/media-gfx/sam2p/sam2p-0.45-r1.ebuild +++ b/media-gfx/sam2p/sam2p-0.45-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/media-gfx/sam2p/sam2p-0.45-r1.ebuild,v 1.9 2008/10/07 06:02:21 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.45-r1.ebuild,v 1.10 2008/11/14 09:15:30 aballier Exp $ inherit toolchain-funcs eutils autotools @@ -24,13 +24,12 @@ src_unpack() { epatch "${FILESDIR}/${P}-nostrip.patch" epatch "${FILESDIR}/${P}-cflags.patch" epatch "${FILESDIR}/${P}-parallelmake.patch" + epatch "${FILESDIR}/${P}-distcc.patch" eautoreconf } src_compile() { tc-export CXX - # Makedep fails with distcc - PATH=${PATH/\/usr\/lib\/distcc\/bin:} econf --enable-lzw $(use_enable gif) || die "econf failed" emake || die "make failed" } |