media-libs/x264: disable asm for armv5

Package-Manager: Portage-2.3.4, Repoman-2.3.2

diff --git a/media-libs/x264/x264-0.0.20160712.ebuild b/media-libs/x264/x264-0.0.20160712.ebuild
index de47d5f3e0267b144e03dc5bc67b1f7263fb1515..e69dab36e1c3f5fa7083a81b94c00f6e9bdfead3 100644 (file)
--- 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 52b983066162d0dfdca90fda84566a4320a81f83..ad54c5cdf91ba813a2ab58ec4362e5c4408292c9 100644 (file)
--- 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