summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2021-12-17 23:08:39 +0000
committerMarek Szuba <marecki@gentoo.org>2021-12-17 23:18:00 +0000
commit0ca8f8468c7f4c1e980eee134e106fd62cb784bc (patch)
tree0722eda89020e9729c7a50000aa6d4c3df2e4173
parentmedia-gfx/gthumb: keyword latest ~arm64 (diff)
downloadgentoo-0ca8f8468c7f4c1e980eee134e106fd62cb784bc.tar.gz
gentoo-0ca8f8468c7f4c1e980eee134e106fd62cb784bc.tar.bz2
gentoo-0ca8f8468c7f4c1e980eee134e106fd62cb784bc.zip
dev-libs/isa-l: disallow overriding AS on amd64
Closes: https://bugs.gentoo.org/829497 Signed-off-by: Marek Szuba <marecki@gentoo.org>
-rw-r--r--dev-libs/isa-l/isa-l-2.30.0.ebuild15
1 files 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
}