diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-04-23 22:57:01 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-04-23 22:57:01 +0000 |
| commit | 837b43f14a1c047a355e86ed91065419be0deb83 (patch) | |
| tree | dbd5143e7fbeab853fdd8d8ff61a79c8aad6a582 /x11-base | |
| parent | stable on x86 (bug #128737) (diff) | |
| download | gentoo-2-837b43f14a1c047a355e86ed91065419be0deb83.tar.gz gentoo-2-837b43f14a1c047a355e86ed91065419be0deb83.tar.bz2 gentoo-2-837b43f14a1c047a355e86ed91065419be0deb83.zip | |
Fix the USE=-xorg build, can't do use_with() on mesa-source because it won't accept the --without option.
(Portage version: 2.1_pre9-r3)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 36cb1a8fb848..28a1df531855 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.107 2006/04/23 22:34:16 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.108 2006/04/23 22:57:01 spyderous Exp $ + + 23 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-1.0.99.901-r1.ebuild: + Fix the USE=-xorg build, can't do use_with() on mesa-source because it won't + accept the --without option. 23 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; files/digest-xorg-server-1.0.99.901-r1: diff --git a/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild index d15f88e130aa..8b1105e24711 100644 --- a/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild,v 1.2 2006/04/23 22:32:14 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.901-r1.ebuild,v 1.3 2006/04/23 22:57:01 spyderous Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -129,6 +129,12 @@ pkg_setup() { conf_opts="${conf_opts} --disable-xsdl" fi + # Only Xorg and Xgl support this, and we won't build Xgl + # until it merges to trunk + if use xorg; then + conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}" + fi + CONFIGURE_OPTIONS=" $(use_enable ipv6) $(use_enable dmx) @@ -137,7 +143,6 @@ pkg_setup() { $(use_enable !minimal xnest) $(use_enable dri) $(use_enable xorg) - $(use_with xorg mesa-source=${WORKDIR}/${MESA_P}) $(use_enable xprint) $(use_enable nptl glx-tls) --sysconfdir=/etc/X11 |