| 1 |
commit: c0fa018451c60ed2c85417cc76a222d2a580f403 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 7 11:50:56 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 7 11:50:56 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fa0184 |
| 7 |
|
| 8 |
media-libs/x265: Disable arm assembly when requesting a PIC build, it is not PIC. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
media-libs/x265/x265-2.2.ebuild | 3 ++- |
| 13 |
media-libs/x265/x265-9999.ebuild | 3 ++- |
| 14 |
2 files changed, 4 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild |
| 17 |
index a53a6c0..21d6b90 100644 |
| 18 |
--- a/media-libs/x265/x265-2.2.ebuild |
| 19 |
+++ b/media-libs/x265/x265-2.2.ebuild |
| 20 |
@@ -145,7 +145,8 @@ multilib_src_configure() { |
| 21 |
# bug #510890 |
| 22 |
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) |
| 23 |
elif [[ ${ABI} = arm ]] ; then |
| 24 |
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) ) |
| 25 |
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon ON OFF)) ) |
| 26 |
+ use neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." |
| 27 |
fi |
| 28 |
|
| 29 |
local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) |
| 30 |
|
| 31 |
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild |
| 32 |
index 3e2490c..96a0204 100644 |
| 33 |
--- a/media-libs/x265/x265-9999.ebuild |
| 34 |
+++ b/media-libs/x265/x265-9999.ebuild |
| 35 |
@@ -145,7 +145,8 @@ multilib_src_configure() { |
| 36 |
# bug #510890 |
| 37 |
myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) |
| 38 |
elif [[ ${ABI} = arm ]] ; then |
| 39 |
- myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) ) |
| 40 |
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon ON OFF)) ) |
| 41 |
+ use neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." |
| 42 |
fi |
| 43 |
|
| 44 |
local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) |
Archives