[gentoo-commits] repo/gentoo:master commit in: dev-libs/isa-l/

["Marek Szuba" <marecki@gentoo.org>]

commit:     0ca8f8468c7f4c1e980eee134e106fd62cb784bc
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 17 23:08:39 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 23:18:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca8f846

dev-libs/isa-l: disallow overriding AS on amd64

Closes: https://bugs.gentoo.org/829497
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-libs/isa-l/isa-l-2.30.0.ebuild | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-libs/isa-l/isa-l-2.30.0.ebuild b/dev-libs/isa-l/isa-l-2.30.0.ebuild
index 641f57997e4b..1cb5aeb2a2c7 100644
--- a/dev-libs/isa-l/isa-l-2.30.0.ebuild
+++ b/dev-libs/isa-l/isa-l-2.30.0.ebuild
@@ -13,10 +13,12 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-#DEPEND=""
-#RDEPEND=""
-# TODO: yasm version to support avx512?
-BDEPEND="amd64? ( >=dev-lang/nasm-2.15 )"
+BDEPEND="amd64? (
+	|| (
+		>=dev-lang/nasm-2.13
+		>=dev-lang/yasm-1.2.0
+	)
+)"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.30.0_makefile-no-D.patch
@@ -24,6 +26,11 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	# isa-l does not support arbitrary assemblers on amd64 (and presumably x86),
+	# it must be either nasm or yasm.
+	use amd64 && unset AS
+
 	eautoreconf
 }