commit: 6e149596cc76f1bbcee6720828c8c8c92420f2a3 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sun May 24 19:47:08 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sun May 24 20:23:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e149596
media-libs/x265: drop USE=pic Gentoo's toolchain uses PIC by default. Since USE=asm was added, we no longer need a USE flag to control that behavior. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> media-libs/x265/x265-3.3.ebuild | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild index 503dca0ef3e..9428b001e84 100644 --- a/media-libs/x265/x265-3.3.ebuild +++ b/media-libs/x265/x265-3.3.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265/wiki/Home"; LICENSE="GPL-2" # subslot = libx265 soname SLOT="0/188" -IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa pic power8 test" +IUSE="+asm +10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_altivec numa power8 test" # Test suite requires assembly support and is known to be broken RESTRICT="test" @@ -122,11 +122,9 @@ x265_variant_src_configure() { } multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC - local myabicmakeargs=( $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") + -DENABLE_PIC=ON -DENABLE_LIBNUMA=$(usex numa ON OFF) -DLIB_INSTALL_DIR="$(get_libdir)" ) @@ -134,9 +132,9 @@ multilib_src_configure() { local supports_asm=yes if [[ ${ABI} = x86 ]] ; then - if use asm && use pic ; then + if use asm ; then # Bug #528202 - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." + ewarn "x86 asm is not PIC-safe, disabling it." supports_asm=no fi elif [[ ${ABI} = x32 ]] ; then @@ -146,12 +144,10 @@ multilib_src_configure() { supports_asm=no fi elif [[ ${ABI} = arm ]] ; then - if use asm && use pic ; then - ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." - supports_asm=no - elif use asm && use cpu_flags_arm_neon ; then + if use asm && use cpu_flags_arm_neon ; then supports_asm=yes elif use asm ; then + ewarn "arm asm is not PIC-safe, disabling it." supports_asm=no fi elif [[ ${ABI} = ppc* ]] ; then
