commit: 93253755df3984a0154319e605ef43c938124dfe Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri May 28 15:37:04 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri May 28 15:37:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93253755
media-libs/opus: disable intrinsics automagic Thanks-to: David Michael <fedora.dm0 <AT> gmail.com> Closes: https://bugs.gentoo.org/752069 Signed-off-by: Sam James <sam <AT> gentoo.org> Signed-off-by: David Seifert <soap <AT> gentoo.org> media-libs/opus/opus-1.3.1-r1.ebuild | 4 +++- .../opus/{opus-1.3.1-r1.ebuild => opus-1.3.1-r2.ebuild} | 16 +++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild index 257b3a7fb6f..4386d0bab3a 100644 --- a/media-libs/opus/opus-1.3.1-r1.ebuild +++ b/media-libs/opus/opus-1.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,9 +26,11 @@ multilib_src_configure() { $(use_enable doc) $(use_enable static-libs static) ) + for i in ${INTRINSIC_FLAGS} ; do use ${i} && myeconfargs+=( --enable-intrinsics ) done + if is-flagq -ffast-math || is-flagq -Ofast; then myeconfargs+=( "--enable-float-approx" ) fi diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r2.ebuild similarity index 68% copy from media-libs/opus/opus-1.3.1-r1.ebuild copy to media-libs/opus/opus-1.3.1-r2.ebuild index 257b3a7fb6f..08cffd6f0a3 100644 --- a/media-libs/opus/opus-1.3.1-r1.ebuild +++ b/media-libs/opus/opus-1.3.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"; LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon" IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}" @@ -26,9 +26,15 @@ multilib_src_configure() { $(use_enable doc) $(use_enable static-libs static) ) - for i in ${INTRINSIC_FLAGS} ; do - use ${i} && myeconfargs+=( --enable-intrinsics ) - done + + local i + # We want to disable intrinsics if no flags are enabled + # (This is a fun Bash construct to do that!) + # bug #752069 + for i in "${INTRINSIC_FLAGS}" ; do + use ${i} && myeconfargs+=( --enable-intrinsics ) && break + done || myeconfargs+=( --disable-intrinsics ) + if is-flagq -ffast-math || is-flagq -Ofast; then myeconfargs+=( "--enable-float-approx" ) fi
