| 1 |
commit: 6ff95afeb6a7f095603fc043047621b0cf160fae |
| 2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 8 21:33:32 2017 +0000 |
| 4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 8 21:33:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff95afe |
| 7 |
|
| 8 |
media-libs/x264: disable asm for armv5 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
| 11 |
|
| 12 |
media-libs/x264/x264-0.0.20160712.ebuild | 2 +- |
| 13 |
media-libs/x264/x264-9999.ebuild | 4 ++-- |
| 14 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/x264/x264-0.0.20160712.ebuild b/media-libs/x264/x264-0.0.20160712.ebuild |
| 17 |
index de47d5f3e02..e69dab36e1c 100644 |
| 18 |
--- a/media-libs/x264/x264-0.0.20160712.ebuild |
| 19 |
+++ b/media-libs/x264/x264-0.0.20160712.ebuild |
| 20 |
@@ -38,7 +38,7 @@ multilib_src_configure() { |
| 21 |
tc-export CC |
| 22 |
local asm_conf="" |
| 23 |
|
| 24 |
- if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]]; then |
| 25 |
+ if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]]; then |
| 26 |
asm_conf=" --disable-asm" |
| 27 |
fi |
| 28 |
|
| 29 |
|
| 30 |
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild |
| 31 |
index 52b98306616..ad54c5cdf91 100644 |
| 32 |
--- a/media-libs/x264/x264-9999.ebuild |
| 33 |
+++ b/media-libs/x264/x264-9999.ebuild |
| 34 |
@@ -1,4 +1,4 @@ |
| 35 |
-# Copyright 1999-2016 Gentoo Foundation |
| 36 |
+# Copyright 1999-2017 Gentoo Foundation |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
EAPI=5 |
| 40 |
@@ -38,7 +38,7 @@ multilib_src_configure() { |
| 41 |
tc-export CC |
| 42 |
local asm_conf="" |
| 43 |
|
| 44 |
- if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]]; then |
| 45 |
+ if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]]; then |
| 46 |
asm_conf=" --disable-asm" |
| 47 |
fi |
Archives