diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-05-15 16:19:44 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-05-15 16:19:44 +0000 |
| commit | b757950299972d513da4806d270ef619df3f0689 (patch) | |
| tree | 9246e9f92d34eb2856d6936ccca0be8e6de988e4 /media-libs/libfame | |
| parent | Added ~hppa to KEYWORDS. (diff) | |
| download | gentoo-2-b757950299972d513da4806d270ef619df3f0689.tar.gz gentoo-2-b757950299972d513da4806d270ef619df3f0689.tar.bz2 gentoo-2-b757950299972d513da4806d270ef619df3f0689.zip | |
Apply unconditionally the gcc 3.4 patches on 0.9.1-r1. Improved check for gcc >=3.4 on 0.9.1.
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'media-libs/libfame')
| -rw-r--r-- | media-libs/libfame/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libfame/libfame-0.9.1-r1.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/libfame/libfame-0.9.1.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/media-libs/libfame/ChangeLog b/media-libs/libfame/ChangeLog index 63bdb094020e..1a5c4e23e9c0 100644 --- a/media-libs/libfame/ChangeLog +++ b/media-libs/libfame/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libfame # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.33 2005/05/15 02:11:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/ChangeLog,v 1.34 2005/05/15 16:19:44 flameeyes Exp $ + + 15 May 2005; Diego Pettenò <flameeyes@gentoo.org> libfame-0.9.1.ebuild, + libfame-0.9.1-r1.ebuild: + Apply unconditionally the gcc 3.4 patches on 0.9.1-r1. Improved check for + gcc >=3.4 on 0.9.1. 15 May 2005; Diego Pettenò <flameeyes@gentoo.org> libfame-0.9.1.ebuild, libfame-0.9.1-r1.ebuild: diff --git a/media-libs/libfame/libfame-0.9.1-r1.ebuild b/media-libs/libfame/libfame-0.9.1-r1.ebuild index 41908f9a7618..6b4b46977827 100644 --- a/media-libs/libfame/libfame-0.9.1-r1.ebuild +++ b/media-libs/libfame/libfame-0.9.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.10 2005/05/15 02:11:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.11 2005/05/15 16:19:44 flameeyes Exp $ inherit flag-o-matic toolchain-funcs eutils @@ -21,9 +21,6 @@ src_unpack() { unpack ${A} cd ${S} - [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] || \ - EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 02_all_mmx-configure.patch 03_all_gcc34.patch" - EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV} # Do not add -march=i586, bug #41770. diff --git a/media-libs/libfame/libfame-0.9.1.ebuild b/media-libs/libfame/libfame-0.9.1.ebuild index fc3c62191f96..0efb9a4d0639 100644 --- a/media-libs/libfame/libfame-0.9.1.ebuild +++ b/media-libs/libfame/libfame-0.9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1.ebuild,v 1.10 2005/05/15 02:11:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1.ebuild,v 1.11 2005/05/15 16:19:44 flameeyes Exp $ inherit flag-o-matic toolchain-funcs eutils @@ -23,8 +23,10 @@ src_unpack() { # Added in -r1 EPATCH_EXCLUDE="04_all_pic.patch" - [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] || \ + if ! ( [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -ge "4" ] || \ + [ "$(gcc-major-version)" -ge "4" ] ); then EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 02_all_mmx-configure.patch 03_all_gcc34.patch" + fi EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV} |