summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-04-25 22:46:35 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-04-25 22:46:35 +0000
commit8ef26375abddf663db3fb5922594a62cbebbb7bf (patch)
tree5d74af8bf212026c62723e450ef7bf5c54e41637 /x11-base/xfree
parent- Fix bug 40987 (gentoo should be able to boot with an empty /dev) with patch... (diff)
downloadgentoo-2-8ef26375abddf663db3fb5922594a62cbebbb7bf.tar.gz
gentoo-2-8ef26375abddf663db3fb5922594a62cbebbb7bf.tar.bz2
gentoo-2-8ef26375abddf663db3fb5922594a62cbebbb7bf.zip
Update so gcc-3.4 is respected (#48933).
Diffstat (limited to 'x11-base/xfree')
-rw-r--r--x11-base/xfree/ChangeLog5
-rw-r--r--x11-base/xfree/xfree-4.3.0-r6.ebuild11
2 files changed, 12 insertions, 4 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 11040b8e7f41..1fb0477de828 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xfree
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.330 2004/04/25 21:13:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.331 2004/04/25 22:46:35 spyderous Exp $
+
+ 25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
+ Update so gcc-3.4 is respected (#48933).
25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
Modify TODO. Only thing holding this back from unmasking on our side is adding
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index 6b95069961bb..c100539a772a 100644
--- a/x11-base/xfree/xfree-4.3.0-r6.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r6.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/xfree/xfree-4.3.0-r6.ebuild,v 1.28 2004/04/25 21:13:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.29 2004/04/25 22:46:35 spyderous Exp $
# TODO
# 14 Mar. 2004 <spyderous@gentoo.org>
@@ -404,8 +404,13 @@ src_unpack() {
then
# Should fix bug #4189. gcc-3.x have problems with -march=pentium4
# and -march=athlon-tbird
- replace-flags "-march=pentium4" "-march=pentium3"
- replace-flags "-march=athlon-tbird" "-march=athlon"
+ # Seems fixed on 3.3 and higher
+
+ 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"
+ fi
# Without this, modules breaks with gcc3
if [ "`gcc-version`" = "3.1" ]