diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2004-06-01 06:21:19 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-06-01 06:21:19 +0000 |
commit | f232bf3ae9c667ae49a629cf63c5a650120de408 (patch) | |
tree | f9cf9f85fb7df040fabef9a610430a480203cf80 /x11-base | |
parent | arm KEYWORDS (diff) | |
download | historical-f232bf3ae9c667ae49a629cf63c5a650120de408.tar.gz historical-f232bf3ae9c667ae49a629cf63c5a650120de408.tar.bz2 historical-f232bf3ae9c667ae49a629cf63c5a650120de408.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/Manifest | 4 | ||||
-rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.0.ebuild | 12 |
3 files changed, 15 insertions, 6 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/Manifest b/x11-base/xorg-x11/Manifest index fc1ed3383e8d..480bb5f65549 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,4 +1,4 @@ -MD5 79a8055eb1870d7774e2ca3b5b795abe ChangeLog 6971 MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232 -MD5 980b1525f8b1054da48419da88eff542 xorg-x11-6.7.0.ebuild 39769 +MD5 c68af8929b27b8d56c5cf17c2b85f69a ChangeLog 7132 +MD5 18e14cde0ab4325d3444002fa9857133 xorg-x11-6.7.0.ebuild 39923 MD5 086afe432124eabb3d1964e91a432a57 files/digest-xorg-x11-6.7.0 904 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 |