summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-09-06 09:33:37 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-09-06 09:33:37 +0000
commitf0bf9f4063bb515c31f643f8fb7ae9e1aa02f822 (patch)
treecddbed0f813503669a9edfe681469f638cb7ff02 /media-video
parentMissed one check. (diff)
downloadgentoo-2-f0bf9f4063bb515c31f643f8fb7ae9e1aa02f822.tar.gz
gentoo-2-f0bf9f4063bb515c31f643f8fb7ae9e1aa02f822.tar.bz2
gentoo-2-f0bf9f4063bb515c31f643f8fb7ae9e1aa02f822.zip
Correctly detect cpu by upstream checks when march=native is used, bug #273421
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild3
2 files changed, 7 insertions, 2 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 61b912a282dc..125505204062 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.305 2009/08/04 09:18:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.306 2009/09/06 09:33:37 aballier Exp $
+
+ 06 Sep 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+ Correctly detect cpu by upstream checks when march=native is used, bug
+ #273421
04 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> ffmpeg-9999-r1.ebuild,
metadata.xml:
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index d4b7acdbe9b1..e7dcbfb540b7 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.16 2009/08/04 09:18:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.17 2009/09/06 09:33:37 aballier Exp $
EAPI=2
@@ -159,6 +159,7 @@ src_configure() {
# If they contain an unknown CPU it will not hurt since ffmpeg's configure
# will just ignore it.
for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+ [ "${i}" = "native" ] && i="host" # bug #273421
myconf="${myconf} --cpu=$i"
break
done