summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-04-19 19:04:24 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-04-19 19:04:24 +0000
commit1889db497ad9f600c67ed21db1b980ab58b56ea3 (patch)
tree9320ca84dd6852e088293b7f29d52279abcd620a /x11-base
parentadd the rest as ~ (diff)
downloadgentoo-2-1889db497ad9f600c67ed21db1b980ab58b56ea3.tar.gz
gentoo-2-1889db497ad9f600c67ed21db1b980ab58b56ea3.tar.bz2
gentoo-2-1889db497ad9f600c67ed21db1b980ab58b56ea3.zip
Don't autodetect MMX/SSE/3DNOW, it breaks cross-compilation.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog5
-rw-r--r--x11-base/xfree/xfree-4.3.0-r6.ebuild30
-rw-r--r--x11-base/xorg-x11/ChangeLog5
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0.ebuild42
4 files changed, 78 insertions, 4 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index b1af30266eb0..9b50f30ae7d2 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.326 2004/04/19 06:19:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.327 2004/04/19 19:04:24 spyderous Exp $
+
+ 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
+ Don't autodetect MMX/SSE/3DNOW, it breaks cross-compilation.
19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild:
Fix directory in last commit.
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index 8c8ee73620e4..e4f9fa8e5b5d 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.24 2004/04/19 06:14:07 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.25 2004/04/19 19:04:24 spyderous Exp $
# TODO
# 14 Mar. 2004 <spyderous@gentoo.org>
@@ -462,6 +462,34 @@ src_unpack() {
if use x86
then
+ # optimize Mesa for architecture
+ if use mmx
+ then
+ echo "#define HasMMXSupport YES" >> config/cf/host.def
+ echo "#define MesaUseMMX YES" >> config/cf/host.def
+ else
+ echo "#define HasMMXSupport NO" >> config/cf/host.def
+ echo "#define MesaUseMMX NO" >> config/cf/host.def
+ fi
+
+ if use 3dnow
+ then
+ echo "#define Has3DNowSupport YES" >> config/cf/host.def
+ echo "#define MesaUse3DNow YES" >> config/cf/host.def
+ else
+ echo "#define Has3DNowSupport NO" >> config/cf/host.def
+ echo "#define MesaUse3DNow NO" >> config/cf/host.def
+ fi
+
+ if use sse
+ then
+ echo "#define HasKatmaiSupport YES" >> config/cf/host.def
+ echo "#define MesaUseKatmai YES" >> config/cf/host.def
+ else
+ echo "#define HasKatmaiSupport NO" >> config/cf/host.def
+ echo "#define MesaUseKatmai NO" >> config/cf/host.def
+ fi
+
# build with glide3 support? (build the tdfx_dri.o module)
if use 3dfx
then
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index a8cb54d088a9..fdbf190cf258 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.30 2004/04/19 06:16:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.31 2004/04/19 19:03:37 spyderous Exp $
+
+ 19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+ Don't autodetect MMX/SSE/3DNOW, it breaks cross-compilation.
19 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
Don't remove fonts.* or encodings.dir in dirs not provided by this package
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 a2fd74cd66d0..3d0fe08c4464 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.31 2004/04/19 06:16:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.32 2004/04/19 19:03:37 spyderous Exp $
# This is a snapshot of the XORG-RELEASE-1 branch.
@@ -508,6 +508,46 @@ fi
fi
fi
+ if use x86
+ then
+ # optimize Mesa for architecture
+ if use mmx
+ then
+ echo "#define HasMMXSupport YES" >> config/cf/host.def
+ echo "#define MesaUseMMX YES" >> config/cf/host.def
+ else
+ echo "#define HasMMXSupport NO" >> config/cf/host.def
+ echo "#define MesaUseMMX NO" >> config/cf/host.def
+ fi
+
+ if use 3dnow
+ then
+ echo "#define Has3DNowSupport YES" >> config/cf/host.def
+ echo "#define MesaUse3DNow YES" >> config/cf/host.def
+ else
+ echo "#define Has3DNowSupport NO" >> config/cf/host.def
+ echo "#define MesaUse3DNow NO" >> config/cf/host.def
+ fi
+
+ if use sse
+ then
+ echo "#define HasKatmaiSupport YES" >> config/cf/host.def
+ echo "#define MesaUseKatmai YES" >> config/cf/host.def
+ else
+ echo "#define HasKatmaiSupport NO" >> config/cf/host.def
+ echo "#define MesaUseKatmai NO" >> config/cf/host.def
+ fi
+
+ # build with glide3 support? (build the tdfx_dri.o module)
+ if use 3dfx
+ then
+ echo "#define HasGlide3 YES" >> config/cf/host.def
+ fi
+
+ # Compile the VIA driver
+ # echo "#define XF86ExtraCardDrivers via" >> config/cf/host.def
+ fi
+
if use hppa
then
echo "#define DoLoadableServer NO" >> config/cf/host.def