zorry 14/07/08 22:15:06 Modified: ChangeLog mesa-9.2.5-r1.ebuild mesa-10.2.2.ebuild mesa-10.1.6.ebuild mesa-10.2.1.ebuild Log: Disable asm only on x86 and if use pic #512208 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key FD79807F)
Revision Changes Path 1.567 media-libs/mesa/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.567&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.567&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.566&r2=1.567 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v retrieving revision 1.566 retrieving revision 1.567 diff -u -r1.566 -r1.567 --- ChangeLog 25 Jun 2014 10:45:41 -0000 1.566 +++ ChangeLog 8 Jul 2014 22:15:06 -0000 1.567 @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.566 2014/06/25 10:45:41 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.567 2014/07/08 22:15:06 zorry Exp $ + + 08 Jul 2014; Magnus Granberg zo...@gentoo.org mesa-9.2.5-r1.ebuild, + mesa-10.1.6.ebuild, mesa-10.2.1.ebuild, mesa-10.2.2.ebuild: + Disable asm on x86 only if use pic #512208 *mesa-10.1.6 (25 Jun 2014) *mesa-10.2.2 (25 Jun 2014) 1.3 media-libs/mesa/mesa-9.2.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild?r1=1.2&r2=1.3 Index: mesa-9.2.5-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mesa-9.2.5-r1.ebuild 18 Jun 2014 19:55:05 -0000 1.2 +++ mesa-9.2.5-r1.ebuild 8 Jul 2014 22:15:06 -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/media-libs/mesa/mesa-9.2.5-r1.ebuild,v 1.2 2014/06/18 19:55:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2.5-r1.ebuild,v 1.3 2014/07/08 22:15:06 zorry Exp $ EAPI=5 @@ -301,6 +301,11 @@ " fi + # on abi_x86_32 hardened we need to have asm disable + if [[ ${ABI} == x86* ]] && use pic; then + myconf+=" --disable-asm" + fi + # build fails with BSD indent, bug #428112 use userland_GNU || export INDENT=cat @@ -321,7 +326,6 @@ $(use_enable gles2) \ $(use_enable nptl glx-tls) \ $(use_enable osmesa) \ - $(use_enable !pic asm) \ $(use_enable xa) \ $(use_enable xorg) \ $(use_with llvm-shared-libs) \ 1.2 media-libs/mesa/mesa-10.2.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild?r1=1.1&r2=1.2 Index: mesa-10.2.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mesa-10.2.2.ebuild 25 Jun 2014 10:45:41 -0000 1.1 +++ mesa-10.2.2.ebuild 8 Jul 2014 22:15:06 -0000 1.2 @@ -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/media-libs/mesa/mesa-10.2.2.ebuild,v 1.1 2014/06/25 10:45:41 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.2.ebuild,v 1.2 2014/07/08 22:15:06 zorry Exp $ EAPI=5 @@ -300,6 +300,11 @@ " fi + # on abi_x86_32 hardened we need to have asm disable + if [[ ${ABI} == x86* ]] && use pic; then + myconf+=" --disable-asm" + fi + # build fails with BSD indent, bug #428112 use userland_GNU || export INDENT=cat @@ -316,7 +321,6 @@ $(use_enable gles2) \ $(use_enable nptl glx-tls) \ $(use_enable osmesa) \ - $(use_enable !pic asm) \ --enable-llvm-shared-libs \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ 1.2 media-libs/mesa/mesa-10.1.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild?r1=1.1&r2=1.2 Index: mesa-10.1.6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mesa-10.1.6.ebuild 25 Jun 2014 10:45:41 -0000 1.1 +++ mesa-10.1.6.ebuild 8 Jul 2014 22:15:06 -0000 1.2 @@ -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/media-libs/mesa/mesa-10.1.6.ebuild,v 1.1 2014/06/25 10:45:41 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.1.6.ebuild,v 1.2 2014/07/08 22:15:06 zorry Exp $ EAPI=5 @@ -301,6 +301,11 @@ " fi + # on abi_x86_32 hardened we need to have asm disable + if [[ ${ABI} == x86* ]] && use pic; then + myconf+=" --disable-asm" + fi + # build fails with BSD indent, bug #428112 use userland_GNU || export INDENT=cat @@ -317,7 +322,6 @@ $(use_enable gles2) \ $(use_enable nptl glx-tls) \ $(use_enable osmesa) \ - $(use_enable !pic asm) \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ PYTHON2="${PYTHON}" \ 1.3 media-libs/mesa/mesa-10.2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild?r1=1.2&r2=1.3 Index: mesa-10.2.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mesa-10.2.1.ebuild 18 Jun 2014 19:55:05 -0000 1.2 +++ mesa-10.2.1.ebuild 8 Jul 2014 22:15:06 -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/media-libs/mesa/mesa-10.2.1.ebuild,v 1.2 2014/06/18 19:55:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.2.1.ebuild,v 1.3 2014/07/08 22:15:06 zorry Exp $ EAPI=5 @@ -300,6 +300,11 @@ " fi + # on abi_x86_32 hardened we need to have asm disable + if [[ ${ABI} == x86* ]] && use pic; then + myconf+=" --disable-asm" + fi + # build fails with BSD indent, bug #428112 use userland_GNU || export INDENT=cat @@ -316,7 +321,6 @@ $(use_enable gles2) \ $(use_enable nptl glx-tls) \ $(use_enable osmesa) \ - $(use_enable !pic asm) \ --enable-llvm-shared-libs \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \