diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-06-01 06:21:19 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-06-01 06:21:19 +0000 |
| commit | 04d1fd2b1284a81af012ab7425f4db2fdf2d3da3 (patch) | |
| tree | f03866d677ed61425294f17dddd84aa31e01f184 /x11-base | |
| parent | arm KEYWORDS (diff) | |
| download | gentoo-2-04d1fd2b1284a81af012ab7425f4db2fdf2d3da3.tar.gz gentoo-2-04d1fd2b1284a81af012ab7425f4db2fdf2d3da3.tar.bz2 gentoo-2-04d1fd2b1284a81af012ab7425f4db2fdf2d3da3.zip | |
Prevent -fomit-frame-pointer and k6 flags from being used together (#49310).
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.0.ebuild | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index f0383f128cef..cf23703e24d0 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.41 2004/05/29 18:58:03 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.42 2004/06/01 06:21:19 spyderous Exp $ + + 01 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild: + Prevent -fomit-frame-pointer and k6 flags from being used together (#49310). 29 May 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0.ebuild: Marked stable for sparc. diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild index d5800f4addd7..6fe50591de2f 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.42 2004/05/29 18:58:03 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.43 2004/06/01 06:21:19 spyderous Exp $ # This is a snapshot of the XORG-RELEASE-1 branch. @@ -436,8 +436,14 @@ fi if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ] then - replace-flags "-march=pentium4" "-march=pentium3" - replace-flags "-march=athlon-tbird" "-march=athlon" + replace-cpu-flags "pentium4" "pentium3" + replace-cpu-flags "athlon-tbird" "athlon" + fi + + # Try a fix for #49310, see #50931 for more info. <spyderous> + if [ "`is-flag -fomit-frame-pointer`" ] + then + replace-cpu-flags "i586" "k6" "k6-2" "k6-3" fi # Without this, modules breaks with gcc3 |