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 CBABF15815E for ; Wed, 7 Feb 2024 20:37:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30F04E2A6C; Wed, 7 Feb 2024 20:35:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D2DACE2A5D for ; Wed, 7 Feb 2024 20:35:30 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 6/8] dev-util/intel_clc: Migrate to llvm-r1 Date: Wed, 7 Feb 2024 21:11:41 +0100 Message-ID: <20240207203515.17640-7-mgorny@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240207203515.17640-1-mgorny@gentoo.org> References: <20240207203515.17640-1-mgorny@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: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: e735f722-46b8-49a7-b15e-5be98a4ae777 X-Archives-Hash: ca3a77f32cad65852cf9aebdfa9d3f1b Closes: https://bugs.gentoo.org/923228 Signed-off-by: Michał Górny --- 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(-) 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 @@ EAPI=8 +LLVM_COMPAT=( 16 17 ) PYTHON_COMPAT=( python3_{10..12} ) -inherit llvm meson python-any-r1 +inherit llvm-r1 meson python-any-r1 MY_PV="${PV/_/-}" @@ -31,6 +32,11 @@ RDEPEND=" dev-util/spirv-tools >=sys-libs/zlib-1.2.8:= x11-libs/libdrm + $(llvm_gen_dep ' + dev-util/spirv-llvm-translator:${LLVM_SLOT} + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') " DEPEND="${RDEPEND} dev-libs/expat @@ -41,53 +47,17 @@ BDEPEND=" virtual/pkgconfig " -# 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="17" -LLVM_MIN_SLOT="16" -PER_SLOT_DEPSTR=" - ( - dev-util/spirv-llvm-translator:@SLOT@ - sys-devel/clang:@SLOT@ - sys-devel/llvm:@SLOT@ - ) -" -LLVM_DEPSTR=" - || ( - $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" - done) - ) - =dev-python/mako-0.8.0[${PYTHON_USEDEP}]" } pkg_setup() { - llvm_pkg_setup + llvm-r1_pkg_setup python-any-r1_pkg_setup } src_configure() { - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" local emesonargs=( -Dllvm=enabled diff --git a/dev-util/intel_clc/intel_clc-9999.ebuild b/dev-util/intel_clc/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 @@ EAPI=8 +LLVM_COMPAT=( 16 17 ) PYTHON_COMPAT=( python3_{10..12} ) -inherit llvm meson python-any-r1 +inherit llvm-r1 meson python-any-r1 MY_PV="${PV/_/-}" @@ -31,6 +32,11 @@ RDEPEND=" dev-util/spirv-tools >=sys-libs/zlib-1.2.8:= x11-libs/libdrm + $(llvm_gen_dep ' + dev-util/spirv-llvm-translator:${LLVM_SLOT} + sys-devel/clang:${LLVM_SLOT} + sys-devel/llvm:${LLVM_SLOT} + ') " DEPEND="${RDEPEND} dev-libs/expat @@ -41,53 +47,17 @@ BDEPEND=" virtual/pkgconfig " -# 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="17" -LLVM_MIN_SLOT="16" -PER_SLOT_DEPSTR=" - ( - dev-util/spirv-llvm-translator:@SLOT@ - sys-devel/clang:@SLOT@ - sys-devel/llvm:@SLOT@ - ) -" -LLVM_DEPSTR=" - || ( - $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" - done) - ) - =dev-python/mako-0.8.0[${PYTHON_USEDEP}]" } pkg_setup() { - llvm_pkg_setup + llvm-r1_pkg_setup python-any-r1_pkg_setup } src_configure() { - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" + PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig" local emesonargs=( -Dllvm=enabled -- 2.43.0