diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-05-01 12:04:01 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-05-01 12:04:01 +0000 |
| commit | ea062739ff208cc6cc74dff1807957699ef858c8 (patch) | |
| tree | 57744cef4633fffb0cd9dfe6b81945d002452f50 /media-sound/ardour | |
| parent | ppc/ppc64 stable wrt #365323 (diff) | |
| download | gentoo-2-ea062739ff208cc6cc74dff1807957699ef858c8.tar.gz gentoo-2-ea062739ff208cc6cc74dff1807957699ef858c8.tar.bz2 gentoo-2-ea062739ff208cc6cc74dff1807957699ef858c8.zip | |
Conditionally apply the gcc-4.6 patch (bug #365437).
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/ardour')
| -rw-r--r-- | media-sound/ardour/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/ardour/ardour-2.8.11-r1.ebuild | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog index f9735a7c5864..dffa98b797c5 100644 --- a/media-sound/ardour/ChangeLog +++ b/media-sound/ardour/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/ardour # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.93 2011/04/30 19:53:52 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.94 2011/05/01 12:04:01 radhermit Exp $ + + 01 May 2011; Tim Harder <radhermit@gentoo.org> ardour-2.8.11-r1.ebuild: + Conditionally apply the gcc-4.6 patch (bug #365437). *ardour-2.8.11-r1 (30 Apr 2011) diff --git a/media-sound/ardour/ardour-2.8.11-r1.ebuild b/media-sound/ardour/ardour-2.8.11-r1.ebuild index e1e1d2671cc6..f75398ff9935 100644 --- a/media-sound/ardour/ardour-2.8.11-r1.ebuild +++ b/media-sound/ardour/ardour-2.8.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.11-r1.ebuild,v 1.1 2011/04/30 19:53:52 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.11-r1.ebuild,v 1.2 2011/05/01 12:04:01 radhermit Exp $ EAPI=4 @@ -53,8 +53,11 @@ src_prepare() { epatch "${FILESDIR}"/${P}-flags.patch \ "${FILESDIR}"/${P}-syslibs.patch \ "${FILESDIR}"/${P}-type.patch \ - "${FILESDIR}"/${P}-ldpath.patch \ - "${FILESDIR}"/${P}-gcc46.patch + "${FILESDIR}"/${P}-ldpath.patch + + if [[ ($(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6) ]]; then + epatch "${FILESDIR}"/${P}-gcc46.patch + fi } src_compile() { |