| 1 |
commit: 6e149596cc76f1bbcee6720828c8c8c92420f2a3 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 24 19:47:08 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 24 20:23:53 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e149596 |
| 7 |
|
| 8 |
media-libs/x265: drop USE=pic |
| 9 |
|
| 10 |
Gentoo's toolchain uses PIC by default. Since USE=asm was added, |
| 11 |
we no longer need a USE flag to control that behavior. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 14 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 15 |
|
| 16 |
media-libs/x265/x265-3.3.ebuild | 16 ++++++---------- |
| 17 |
1 file changed, 6 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild |
| 20 |
index 503dca0ef3e..9428b001e84 100644 |
| 21 |
--- a/media-libs/x265/x265-3.3.ebuild |
| 22 |
+++ b/media-libs/x265/x265-3.3.ebuild |
| 23 |
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home" |
| 24 |
LICENSE="GPL-2" |
| 25 |
# subslot = libx265 soname |
| 26 |
SLOT="0/188" |
| 27 |
-IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test" |
| 28 |
+IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test" |
| 29 |
|
| 30 |
# Test suite requires assembly support and is known to be broken |
| 31 |
RESTRICT="test" |
| 32 |
@@ -122,11 +122,9 @@ x265_variant_src_configure() { |
| 33 |
} |
| 34 |
|
| 35 |
multilib_src_configure() { |
| 36 |
- append-cflags -fPIC |
| 37 |
- append-cxxflags -fPIC |
| 38 |
- |
| 39 |
local myabicmakeargs=( |
| 40 |
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") |
| 41 |
+ -DENABLE_PIC=ON |
| 42 |
-DENABLE_LIBNUMA=$(usex numa ON OFF) |
| 43 |
-DLIB_INSTALL_DIR="$(get_libdir)" |
| 44 |
) |
| 45 |
@@ -134,9 +132,9 @@ multilib_src_configure() { |
| 46 |
local supports_asm=yes |
| 47 |
|
| 48 |
if [[ ${ABI} = x86 ]] ; then |
| 49 |
- if use asm && use pic ; then |
| 50 |
+ if use asm ; then |
| 51 |
# Bug #528202 |
| 52 |
- ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." |
| 53 |
+ ewarn "x86 asm is not PIC-safe, disabling it." |
| 54 |
supports_asm=no |
| 55 |
fi |
| 56 |
elif [[ ${ABI} = x32 ]] ; then |
| 57 |
@@ -146,12 +144,10 @@ multilib_src_configure() { |
| 58 |
supports_asm=no |
| 59 |
fi |
| 60 |
elif [[ ${ABI} = arm ]] ; then |
| 61 |
- if use asm && use pic ; then |
| 62 |
- ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." |
| 63 |
- supports_asm=no |
| 64 |
- elif use asm && use cpu_flags_arm_neon ; then |
| 65 |
+ if use asm && use cpu_flags_arm_neon ; then |
| 66 |
supports_asm=yes |
| 67 |
elif use asm ; then |
| 68 |
+ ewarn "arm asm is not PIC-safe, disabling it." |
| 69 |
supports_asm=no |
| 70 |
fi |
| 71 |
elif [[ ${ABI} = ppc* ]] ; then |
Archives