diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-08-16 23:03:00 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-16 23:03:00 +0000 |
| commit | 121079a6b14c4454ab4faa4be207558d490a3663 (patch) | |
| tree | 17ac387e3054bbd172e31ae618b500c662f5376b /media-libs | |
| parent | Remove extra mask protection. (diff) | |
| download | gentoo-2-121079a6b14c4454ab4faa4be207558d490a3663.tar.gz gentoo-2-121079a6b14c4454ab4faa4be207558d490a3663.tar.bz2 gentoo-2-121079a6b14c4454ab4faa4be207558d490a3663.zip | |
Only unset AS for amd64/x86 platforms as the yasm issue does not come up on arm/etc... #345161.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libvpx/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libvpx/libvpx-1.1.0.ebuild | 12 | ||||
| -rw-r--r-- | media-libs/libvpx/libvpx-9999.ebuild | 12 |
3 files changed, 22 insertions, 9 deletions
diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog index 7a1477302939..24c62c1798da 100644 --- a/media-libs/libvpx/ChangeLog +++ b/media-libs/libvpx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libvpx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.64 2012/08/16 18:53:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.65 2012/08/16 23:03:00 vapier Exp $ + + 16 Aug 2012; Mike Frysinger <vapier@gentoo.org> libvpx-1.1.0.ebuild, + libvpx-9999.ebuild: + Only unset AS for amd64/x86 platforms as the yasm issue does not come up on + arm/etc... #345161. 16 Aug 2012; Mike Frysinger <vapier@gentoo.org> +files/libvpx-1.1.0-arm.patch, libvpx-1.1.0.ebuild: diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild index 0fb41c41a198..63af80f2320d 100644 --- a/media-libs/libvpx/libvpx-1.1.0.ebuild +++ b/media-libs/libvpx/libvpx-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.13 2012/08/16 18:53:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.14 2012/08/16 23:03:00 vapier Exp $ EAPI=4 inherit multilib toolchain-funcs base @@ -46,9 +46,13 @@ PATCHES=( ) src_configure() { - #let the build system decide which AS to use (it honours $AS but - #then feeds it with yasm flags without checking...) bug 345161 - unset AS + # let the build system decide which AS to use (it honours $AS but + # then feeds it with yasm flags without checking...) #345161 + local a + tc-export AS + for a in {amd64,x86}{,-{fbsd,linux}} ; do + use ${a} && unset AS + done # build verbose by default MAKEOPTS="${MAKEOPTS} verbose=yes" diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild index ba33b58e05ab..d40bf3636cad 100644 --- a/media-libs/libvpx/libvpx-9999.ebuild +++ b/media-libs/libvpx/libvpx-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.27 2012/08/15 03:40:29 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.28 2012/08/16 23:03:00 vapier Exp $ EAPI=4 inherit multilib toolchain-funcs @@ -40,9 +40,13 @@ REQUIRED_USE=" " src_configure() { - #let the build system decide which AS to use (it honours $AS but - #then feeds it with yasm flags without checking...) bug 345161 - unset AS + # let the build system decide which AS to use (it honours $AS but + # then feeds it with yasm flags without checking...) #345161 + local a + tc-export AS + for a in {amd64,x86}{,-{fbsd,linux}} ; do + use ${a} && unset AS + done # build verbose by default MAKEOPTS="${MAKEOPTS} verbose=yes" |