chithanh 14/09/15 09:22:29 Modified: mesa-progs-8.2.0.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.3 x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild?r1=1.2&r2=1.3 Index: mesa-progs-8.2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mesa-progs-8.2.0.ebuild 15 Sep 2014 02:30:11 -0000 1.2 +++ mesa-progs-8.2.0.ebuild 15 Sep 2014 09:22:29 -0000 1.3 @@ -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 @@ 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 @@ 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 1.109 x11-apps/mesa-progs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/mesa-progs/ChangeLog?rev=1.109&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/mesa-progs/ChangeLog?rev=1.109&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/mesa-progs/ChangeLog?r1=1.108&r2=1.109 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- ChangeLog 15 Sep 2014 02:30:11 -0000 1.108 +++ ChangeLog 15 Sep 2014 09:22:29 -0000 1.109 @@ -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 <[email protected]> + mesa-progs-8.2.0.ebuild: + Fix build failure when all USE flags are disabled, bug #522824. 15 Sep 2014; Patrick Lauer <[email protected]> mesa-progs-8.2.0.ebuild: Temporarily drop keywords #522824
