From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 6/8] dev-util/intel_clc: Migrate to llvm-r1
Date: Wed, 7 Feb 2024 21:11:41 +0100 [thread overview]
Message-ID: <20240207203515.17640-7-mgorny@gentoo.org> (raw)
In-Reply-To: <20240207203515.17640-1-mgorny@gentoo.org>
Closes: https://bugs.gentoo.org/923228
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
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)
- )
- <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
- <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=
-"
-RDEPEND="${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 ">=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)
- )
- <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
- <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=
-"
-RDEPEND="${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 ">=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
next prev parent reply other threads:[~2024-02-07 20:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-07 20:11 [gentoo-dev] [PATCH 0/8] llvm-r1.eclass + llvm-utils.eclass: new eclasses to sort out LLVM mess Michał Górny
2024-02-07 20:11 ` [gentoo-dev] [PATCH 1/8] llvm-utils.eclass: Introduce an eclass for common helpers Michał Górny
2024-02-07 20:11 ` [gentoo-dev] [PATCH 2/8] llvm-utils.eclass: Split out PATH prepending logic Michał Górny
2024-02-07 20:11 ` [gentoo-dev] [PATCH 3/8] llvm-utils.eclass: Fix llvm_prepend_path to avoid duplicates Michał Górny
2024-02-08 19:06 ` [gentoo-dev] [PATCH] " Michał Górny
2024-02-07 20:11 ` [gentoo-dev] [PATCH 4/8] profiles: Introduce LLVM_SLOT USE_EXPAND variable Michał Górny
2024-02-07 20:11 ` [gentoo-dev] [PATCH 5/8] llvm-r1.eclass: Initial version Michał Górny
2024-02-08 19:07 ` [gentoo-dev] [PATCH v2] " Michał Górny
2024-02-09 16:59 ` [gentoo-dev] [PATCH v3] " Michał Górny
2024-02-09 23:49 ` Sam James
2024-02-07 20:11 ` Michał Górny [this message]
2024-02-08 7:00 ` [gentoo-dev] [PATCH 6/8] dev-util/intel_clc: Migrate to llvm-r1 Sam James
2024-02-08 12:35 ` Arsen Arsenović
2024-02-07 20:11 ` [gentoo-dev] [PATCH 7/8] media-libs/mesa: " Michał Górny
2024-02-07 20:11 ` [gentoo-dev] [PATCH 8/8] sys-devel/lld: Migrate to llvm-utils.eclass Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240207203515.17640-7-mgorny@gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox