[gentoo-commits] repo/gentoo:master commit in: media-libs/x264/

[Markus Meier]

commit:     6ff95afeb6a7f095603fc043047621b0cf160fae
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  8 21:33:32 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 21:33:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff95afe

media-libs/x264: disable asm for armv5

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 media-libs/x264/x264-0.0.20160712.ebuild | 2 +-
 media-libs/x264/x264-9999.ebuild         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/x264/x264-0.0.20160712.ebuild 
b/media-libs/x264/x264-0.0.20160712.ebuild
index de47d5f3e02..e69dab36e1c 100644
--- a/media-libs/x264/x264-0.0.20160712.ebuild
+++ b/media-libs/x264/x264-0.0.20160712.ebuild
@@ -38,7 +38,7 @@ multilib_src_configure() {
        tc-export CC
        local asm_conf=""
 
-       if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || 
[[ ${ABI} == "x32" ]]; then
+       if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || 
[[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]]; then
                asm_conf=" --disable-asm"
        fi
 

diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 52b98306616..ad54c5cdf91 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -38,7 +38,7 @@ multilib_src_configure() {
        tc-export CC
        local asm_conf=""
 
-       if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || 
[[ ${ABI} == "x32" ]]; then
+       if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || 
[[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]]; then
                asm_conf=" --disable-asm"
        fi