diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-09-15 09:22:29 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-09-15 09:22:29 +0000 |
| commit | 03dc2621c916ff34acf63fbd0c8772a21f4cadf8 (patch) | |
| tree | 5a2c2ffb0af872061edcd2beefcdd4d26dc81159 /x11-apps | |
| parent | Version bump (bug #319245). (diff) | |
| download | gentoo-2-03dc2621c916ff34acf63fbd0c8772a21f4cadf8.tar.gz gentoo-2-03dc2621c916ff34acf63fbd0c8772a21f4cadf8.tar.bz2 gentoo-2-03dc2621c916ff34acf63fbd0c8772a21f4cadf8.zip | |
Fix build failure when all USE flags are disabled, bug #522824.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/mesa-progs/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 22 |
2 files changed, 8 insertions, 20 deletions
diff --git a/x11-apps/mesa-progs/ChangeLog b/x11-apps/mesa-progs/ChangeLog index b9eadc32bd8c..2c459f14974f 100644 --- a/x11-apps/mesa-progs/ChangeLog +++ b/x11-apps/mesa-progs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/mesa-progs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.108 2014/09/15 02:30:11 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.109 2014/09/15 09:22:29 chithanh Exp $ + + 15 Sep 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + mesa-progs-8.2.0.ebuild: + Fix build failure when all USE flags are disabled, bug #522824. 15 Sep 2014; Patrick Lauer <patrick@gentoo.org> mesa-progs-8.2.0.ebuild: Temporarily drop keywords #522824 diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild index f2cd8402a4ce..18c49caeb8c7 100644 --- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild,v 1.2 2014/09/15 02:30:11 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild,v 1.3 2014/09/15 09:22:29 chithanh Exp $ EAPI=5 @@ -25,9 +25,7 @@ fi LICENSE="LGPL-2" SLOT="0" -#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -# temporarily remove keywords #522824 -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" IUSE="egl gles1 gles2" RDEPEND=" @@ -55,22 +53,8 @@ src_prepare() { eautoreconf } -src_configure() { - # We're not using the complete buildsystem if we only want to build - # glxinfo and glxgears. - if use egl || use gles1 || use gles2; then - default_src_configure - fi -} - src_compile() { - if ! use egl && ! use gles1 && ! use gles2; then - tc-export CC - emake LDLIBS='-lX11 -lGL' src/xdemos/glxinfo - emake LDLIBS='-lX11 -lGL -lm' src/xdemos/glxgears - else - emake -C src/xdemos glxgears glxinfo - fi + emake -C src/xdemos glxgears glxinfo if use egl; then emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo |