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

diff --git a/media-libs/x265/x265-2.2.ebuild b/media-libs/x265/x265-2.2.ebuild
index a53a6c0caa95bb5a52e511be96acb7e18f5ddfc0..21d6b90d3729616e71e64dc1e457a7195fd6534b 100644 (file)
--- 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 3e2490cd0219f65f6f5a7b90a21c04ba42ebb842..96a02045099c59433e77118935cec805ff46bc3d 100644 (file)
--- 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) )