From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9767215838C for ; Wed, 31 Jan 2024 12:21:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D473B2BC025; Wed, 31 Jan 2024 12:21:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD7392BC025 for ; Wed, 31 Jan 2024 12:21:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA579343097 for ; Wed, 31 Jan 2024 12:21:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02779105D for ; Wed, 31 Jan 2024 12:21:20 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1706703670.cb301bb7e5d602f498b6d3d6de36e898b6431cea.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/isa-l/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/isa-l/isa-l-2.30.0-r1.ebuild X-VCS-Directories: dev-libs/isa-l/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: cb301bb7e5d602f498b6d3d6de36e898b6431cea X-VCS-Branch: master Date: Wed, 31 Jan 2024 12:21:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a498fd45-f4a0-4acf-8bc8-4895caf7b39e X-Archives-Hash: 37e9e497c668f4fc2898aa64cde65da4 commit: cb301bb7e5d602f498b6d3d6de36e898b6431cea Author: Marek Szuba gentoo org> AuthorDate: Wed Jan 31 12:19:57 2024 +0000 Commit: Marek Szuba gentoo 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 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 }