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

[Alexis Ballier]

commit:     c0fa018451c60ed2c85417cc76a222d2a580f403
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 11:50:56 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 11:50:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0fa0184

media-libs/x265: Disable arm assembly when requesting a PIC build, it is not 
PIC.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index a53a6c0..21d6b90 100644
--- a/media-libs/x265/x265-2.2.ebuild
+++ b/media-libs/x265/x265-2.2.ebuild
@@ -145,7 +145,8 @@ multilib_src_configure() {
                # bug #510890
                myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
        elif [[ ${ABI} = arm ]] ; then
-               myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) )
+               myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon 
ON OFF)) )
+               use neon && use pic && ewarn "PIC has been requested but arm 
neon asm is not PIC-safe, disabling it."
        fi
 
        local MULTIBUILD_VARIANTS=( $(x265_get_variants) )

diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 3e2490c..96a0204 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -145,7 +145,8 @@ multilib_src_configure() {
                # bug #510890
                myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
        elif [[ ${ABI} = arm ]] ; then
-               myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex neon ON OFF) )
+               myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex neon 
ON OFF)) )
+               use neon && use pic && ewarn "PIC has been requested but arm 
neon asm is not PIC-safe, disabling it."
        fi
 
        local MULTIBUILD_VARIANTS=( $(x265_get_variants) )