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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 93A0915815E for ; Thu, 8 Feb 2024 07:01:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC064E2AAB; Thu, 8 Feb 2024 07:01:24 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 517D9E2A9D for ; Thu, 8 Feb 2024 07:01:24 +0000 (UTC) References: <20240207203515.17640-1-mgorny@gentoo.org> <20240207203515.17640-7-mgorny@gentoo.org> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Sam James To: gentoo-dev@lists.gentoo.org Cc: =?utf-8?B?TWljaGHFgiBHw7Nybnk=?= , Arsen =?utf-8?Q?Arsenovi=C4=87?= Subject: Re: [gentoo-dev] [PATCH 6/8] dev-util/intel_clc: Migrate to llvm-r1 Date: Thu, 08 Feb 2024 07:00:58 +0000 Organization: Gentoo In-reply-to: <20240207203515.17640-7-mgorny@gentoo.org> Message-ID: <87r0hntp6o.fsf@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Archives-Salt: 21184e27-a12e-4ec0-98a7-41ed3b1eadc5 X-Archives-Hash: 5cf166a4286d57c7301c9e02089135c6 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Micha=C5=82 G=C3=B3rny writes: > Closes: https://bugs.gentoo.org/923228 > Signed-off-by: Micha=C5=82 G=C3=B3rny > --- > dev-util/intel_clc/intel_clc-24.0.0.ebuild | 48 ++++------------------ > dev-util/intel_clc/intel_clc-9999.ebuild | 48 ++++------------------ > 2 files changed, 18 insertions(+), 78 deletions(-) Arsen, could you verify this does solve the problem for you, just to be sure? > > diff --git a/dev-util/intel_clc/intel_clc-24.0.0.ebuild b/dev-util/intel_= clc/intel_clc-24.0.0.ebuild > index 10dd7e930b24..adb22e32e30a 100644 > --- a/dev-util/intel_clc/intel_clc-24.0.0.ebuild > +++ b/dev-util/intel_clc/intel_clc-24.0.0.ebuild > @@ -3,9 +3,10 @@ >=20=20 > EAPI=3D8 >=20=20 > +LLVM_COMPAT=3D( 16 17 ) > PYTHON_COMPAT=3D( python3_{10..12} ) >=20=20 > -inherit llvm meson python-any-r1 > +inherit llvm-r1 meson python-any-r1 >=20=20 > MY_PV=3D"${PV/_/-}" >=20=20 > @@ -31,6 +32,11 @@ RDEPEND=3D" > dev-util/spirv-tools > >=3Dsys-libs/zlib-1.2.8:=3D > x11-libs/libdrm > + $(llvm_gen_dep ' > + dev-util/spirv-llvm-translator:${LLVM_SLOT} > + sys-devel/clang:${LLVM_SLOT} > + sys-devel/llvm:${LLVM_SLOT} > + ') > " > DEPEND=3D"${RDEPEND} > dev-libs/expat > @@ -41,53 +47,17 @@ BDEPEND=3D" > virtual/pkgconfig > " >=20=20 > -# Please keep the LLVM dependency block separate. Since LLVM is slotted, > -# we need to *really* make sure we're not pulling one than more slot > -# simultaneously. > -# > -# How to use it: > -# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. > -# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 16. > -LLVM_MAX_SLOT=3D"17" > -LLVM_MIN_SLOT=3D"16" > -PER_SLOT_DEPSTR=3D" > - ( > - dev-util/spirv-llvm-translator:@SLOT@ > - sys-devel/clang:@SLOT@ > - sys-devel/llvm:@SLOT@ > - ) > -" > -LLVM_DEPSTR=3D" > - || ( > - $(for ((slot=3DLLVM_MAX_SLOT; slot>=3DLLVM_MIN_SLOT; slot--)); do > - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" > - done) > - ) > - - -" > -RDEPEND=3D"${RDEPEND} > - ${LLVM_DEPSTR} > -" > -unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR > - > -llvm_check_deps() { > - has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" && > - has_version "sys-devel/clang:${LLVM_SLOT}" && > - has_version "sys-devel/llvm:${LLVM_SLOT}" > -} > - > python_check_deps() { > python_has_version -b ">=3Ddev-python/mako-0.8.0[${PYTHON_USEDEP}]" > } >=20=20 > pkg_setup() { > - llvm_pkg_setup > + llvm-r1_pkg_setup > python-any-r1_pkg_setup > } >=20=20 > src_configure() { > - PKG_CONFIG_PATH=3D"$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/= pkgconfig" > + PKG_CONFIG_PATH=3D"$(get_llvm_prefix)/$(get_libdir)/pkgconfig" >=20=20 > local emesonargs=3D( > -Dllvm=3Denabled > diff --git a/dev-util/intel_clc/intel_clc-9999.ebuild b/dev-util/intel_cl= c/intel_clc-9999.ebuild > index 10dd7e930b24..adb22e32e30a 100644 > --- a/dev-util/intel_clc/intel_clc-9999.ebuild > +++ b/dev-util/intel_clc/intel_clc-9999.ebuild > @@ -3,9 +3,10 @@ >=20=20 > EAPI=3D8 >=20=20 > +LLVM_COMPAT=3D( 16 17 ) > PYTHON_COMPAT=3D( python3_{10..12} ) >=20=20 > -inherit llvm meson python-any-r1 > +inherit llvm-r1 meson python-any-r1 >=20=20 > MY_PV=3D"${PV/_/-}" >=20=20 > @@ -31,6 +32,11 @@ RDEPEND=3D" > dev-util/spirv-tools > >=3Dsys-libs/zlib-1.2.8:=3D > x11-libs/libdrm > + $(llvm_gen_dep ' > + dev-util/spirv-llvm-translator:${LLVM_SLOT} > + sys-devel/clang:${LLVM_SLOT} > + sys-devel/llvm:${LLVM_SLOT} > + ') > " > DEPEND=3D"${RDEPEND} > dev-libs/expat > @@ -41,53 +47,17 @@ BDEPEND=3D" > virtual/pkgconfig > " >=20=20 > -# Please keep the LLVM dependency block separate. Since LLVM is slotted, > -# we need to *really* make sure we're not pulling one than more slot > -# simultaneously. > -# > -# How to use it: > -# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. > -# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 16. > -LLVM_MAX_SLOT=3D"17" > -LLVM_MIN_SLOT=3D"16" > -PER_SLOT_DEPSTR=3D" > - ( > - dev-util/spirv-llvm-translator:@SLOT@ > - sys-devel/clang:@SLOT@ > - sys-devel/llvm:@SLOT@ > - ) > -" > -LLVM_DEPSTR=3D" > - || ( > - $(for ((slot=3DLLVM_MAX_SLOT; slot>=3DLLVM_MIN_SLOT; slot--)); do > - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" > - done) > - ) > - - -" > -RDEPEND=3D"${RDEPEND} > - ${LLVM_DEPSTR} > -" > -unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR > - > -llvm_check_deps() { > - has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" && > - has_version "sys-devel/clang:${LLVM_SLOT}" && > - has_version "sys-devel/llvm:${LLVM_SLOT}" > -} > - > python_check_deps() { > python_has_version -b ">=3Ddev-python/mako-0.8.0[${PYTHON_USEDEP}]" > } >=20=20 > pkg_setup() { > - llvm_pkg_setup > + llvm-r1_pkg_setup > python-any-r1_pkg_setup > } >=20=20 > src_configure() { > - PKG_CONFIG_PATH=3D"$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/= pkgconfig" > + PKG_CONFIG_PATH=3D"$(get_llvm_prefix)/$(get_libdir)/pkgconfig" >=20=20 > local emesonargs=3D( > -Dllvm=3Denabled --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iOUEARYKAI0WIQQlpruI3Zt2TGtVQcJzhAn1IN+RkAUCZcR8QF8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0MjVB NkJCODhERDlCNzY0QzZCNTU0MUMyNzM4NDA5RjUyMERGOTE5MA8cc2FtQGdlbnRv by5vcmcACgkQc4QJ9SDfkZAwMwEAxA92YHYDYaxWO0iB2LQEAs7MqMg6ArKVYabf 5+Fjma8A/2SUqMxr6Mbiy9zi/Kd1IIhkcMx1w6Quxwe4VO4d35QG =A/RY -----END PGP SIGNATURE----- --=-=-=--