commit: cb301bb7e5d602f498b6d3d6de36e898b6431cea Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Wed Jan 31 12:19:57 2024 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Wed Jan 31 12:21:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb301bb7
dev-libs/isa-l: add missing x86 BDEPEND Closes: https://bugs.gentoo.org/923347 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> dev-libs/isa-l/isa-l-2.30.0-r1.ebuild | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild index 5998011ab3dd..6cb8319addff 100644 --- a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild +++ b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild @@ -15,13 +15,22 @@ KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86" IUSE="cpu_flags_x86_avx512f" # AVX512 support in yasm is still work in progress -BDEPEND="amd64? ( - cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 ) - !cpu_flags_x86_avx512f? ( || ( - >=dev-lang/nasm-2.11.01 - >=dev-lang/yasm-1.2.0 - ) ) -)" +BDEPEND=" + amd64? ( + cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 ) + !cpu_flags_x86_avx512f? ( || ( + >=dev-lang/nasm-2.11.01 + >=dev-lang/yasm-1.2.0 + ) ) + ) + x86? ( + cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 ) + !cpu_flags_x86_avx512f? ( || ( + >=dev-lang/nasm-2.11.01 + >=dev-lang/yasm-1.2.0 + ) ) + ) +" PATCHES=( "${FILESDIR}"/${PN}-2.30.0_makefile-no-D.patch @@ -31,9 +40,11 @@ PATCHES=( src_prepare() { default - # isa-l does not support arbitrary assemblers on amd64 (and presumably x86), + # isa-l does not support arbitrary assemblers on amd64 and x86, # it must be either nasm or yasm. - use amd64 && unset AS + if use amd64 || use x86; then + unset AS + fi eautoreconf }
