summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-09-10 21:02:48 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-09-10 21:02:48 +0000
commit31d5bca3c14d858fe6715ea25fa0a5f7f657a528 (patch)
tree83e7fe6ce6aa18ecb1c8807b45a7b2e5d8ea4a64 /x11-base
parentNew version of cyrus-imapd. Kerberos is now supported. Updated (diff)
downloadgentoo-2-31d5bca3c14d858fe6715ea25fa0a5f7f657a528.tar.gz
gentoo-2-31d5bca3c14d858fe6715ea25fa0a5f7f657a528.tar.bz2
gentoo-2-31d5bca3c14d858fe6715ea25fa0a5f7f657a528.zip
gcc3 fixes
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog6
-rw-r--r--x11-base/xfree/xfree-4.2.1.ebuild19
2 files changed, 19 insertions, 6 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 29b3a8ae1ed2..e9af6287c557 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xfree
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.40 2002/09/08 20:02:04 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.41 2002/09/10 21:02:48 azarah Exp $
+
+ 10 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
+
+ Gcc3 related fixes.
*xfree-4.2.1 (8 Sep 2002):
diff --git a/x11-base/xfree/xfree-4.2.1.ebuild b/x11-base/xfree/xfree-4.2.1.ebuild
index 147e8e3d2063..34da9962090e 100644
--- a/x11-base/xfree/xfree-4.2.1.ebuild
+++ b/x11-base/xfree/xfree-4.2.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.2 2002/09/08 21:25:25 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.3 2002/09/10 21:02:48 azarah Exp $
-inherit flag-o-matic
+inherit flag-o-matic gcc
# Compile problems with these ...
filter-flags "-funroll-loops"
@@ -153,8 +153,7 @@ src_unpack() {
echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
>> config/cf/host.def
- [ -z "${CC}" ] && CC=gcc
- if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ]
+ if [ "`gcc-version`" != "2.95" ]
then
# should fix bug #4189. gcc-3.x have problems with -march=pentium4
# and -march=athlon-tbird
@@ -217,7 +216,17 @@ src_compile() {
src_install() {
- make install DESTDIR=${D} || die
+ # gcc3 related fix. Do this during install, so that our
+ # whole build will not be compiled without mmx instructions.
+ if [ "`gcc-version`" != "2.95" ] && [ "${ARCH}" = "x86" ]
+ then
+ make install \
+ CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx"
+ CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx"
+ DESTDIR=${D} || die
+ else
+ make install DESTDIR=${D} || die
+ fi
make install.man DESTDIR=${D} || die