summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-11-18 16:25:24 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-11-18 16:25:24 +0000
commitfcf4622446e17681130f990f6cc41f62b9b6d77f (patch)
treeea7739dc3f86683ede3ab5709d34193c1ae831ea /x11-base
parentAdded gentoo patch, which consolidates common patches with the addition of so... (diff)
downloadgentoo-2-fcf4622446e17681130f990f6cc41f62b9b6d77f.tar.gz
gentoo-2-fcf4622446e17681130f990f6cc41f62b9b6d77f.tar.bz2
gentoo-2-fcf4622446e17681130f990f6cc41f62b9b6d77f.zip
For USE=uclibc, stop building glxgears and glxinfo. But build GLU library again.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild13
2 files changed, 13 insertions, 7 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 3f39903c3907..9db5b47da44c 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.210 2004/11/17 18:32:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.211 2004/11/18 16:25:24 spyderous Exp $
+
+ 18 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.0-r4.ebuild:
+ For USE=uclibc, stop building glxgears and glxinfo. But build GLU library
+ again.
17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; :
Update credits on xpm-secfix-thomas.diff.
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 90549531191c..66e65de3f998 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.2 2004/11/17 18:24:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.3 2004/11/18 16:25:24 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -233,6 +233,12 @@ src_unpack() {
host_def_setup
+ # uclibc lacks sinf and cosf
+ if use uclibc; then
+ sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \
+ ${S}/programs/Imakefile
+ fi
+
cd ${S}
if use doc; then
# These are not included anymore as they are obsolete
@@ -749,11 +755,6 @@ host_def_setup() {
use_build xv BuildXvLibrary
use_build xv BuildXvExt
- # uclibc love from iggy
- if use uclibc; then
- echo "#define BuildGLULibrary NO" >> config/cf/host.def
- fi
-
if use alpha; then
echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
i740 tdfx cirrus tseng fbdev \