diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2007-02-19 21:24:35 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2007-02-19 21:24:35 +0000 |
| commit | cadf3d5b528358d4743cb171bc7b601f5bdb519c (patch) | |
| tree | eb38c64c28ef691b283ab847bc2f12aed156e68f | |
| parent | Stablized _pre14 on amd64, removed older versions, added RESTRICT=test to _pre14 (diff) | |
| download | gentoo-2-cadf3d5b528358d4743cb171bc7b601f5bdb519c.tar.gz gentoo-2-cadf3d5b528358d4743cb171bc7b601f5bdb519c.tar.bz2 gentoo-2-cadf3d5b528358d4743cb171bc7b601f5bdb519c.zip | |
Re-add die to mesa if building +xcb when libX11 is -xcb. (Bug #163761, Petteri
Räty)
(Portage version: 2.1.2-r9)
| -rw-r--r-- | media-libs/mesa/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.5.2.ebuild | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 7e02fd799e72..d4c24615eb80 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.138 2007/02/18 08:00:28 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.139 2007/02/19 21:24:35 joshuabaergen Exp $ + + 19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.5.2.ebuild: + Re-add die to mesa if building +xcb when libX11 is -xcb. (Bug #163761, Petteri + Räty) 18 Feb 2007; Ryan Hill <dirtyepic@gentoo.org> mesa-6.5.2.ebuild: Apply previous fix to the 6.5.2 ebuild as well. diff --git a/media-libs/mesa/mesa-6.5.2.ebuild b/media-libs/mesa/mesa-6.5.2.ebuild index dbfc0d2e69ec..563d9222ed1f 100644 --- a/media-libs/mesa/mesa-6.5.2.ebuild +++ b/media-libs/mesa/mesa-6.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.4 2007/02/18 08:00:28 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.5 2007/02/19 21:24:35 joshuabaergen Exp $ inherit eutils toolchain-funcs multilib flag-o-matic portability @@ -72,6 +72,14 @@ if use debug; then fi pkg_setup() { + if use xcb; then + if ! built_with_use x11-libs/libX11 xcb; then + msg="You must build libX11 with xcb enabled." + eerror ${msg} + die ${msg} + fi + fi + if use debug; then strip-flags append-flags -g |