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 616AF15815E for ; Sat, 10 Feb 2024 10:47:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43A39E2B25; Sat, 10 Feb 2024 10:47:36 +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 1532AE2B25 for ; Sat, 10 Feb 2024 10:47:36 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A09B3431D7 for ; Sat, 10 Feb 2024 10:47:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A4CB14CF for ; Sat, 10 Feb 2024 10:47:32 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1707562044.fe756615c56e52511bdd35c8247a59ecfc1f5f79.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel_clc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/intel_clc/intel_clc-24.0.0.ebuild dev-util/intel_clc/intel_clc-9999.ebuild X-VCS-Directories: dev-util/intel_clc/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fe756615c56e52511bdd35c8247a59ecfc1f5f79 X-VCS-Branch: master Date: Sat, 10 Feb 2024 10:47:32 +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: 9ebef58c-62d4-43db-8b2c-63ac785ed570 X-Archives-Hash: 0c760aa0ce0313286a10e88e19c0649d commit: fe756615c56e52511bdd35c8247a59ecfc1f5f79 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 5 19:30:02 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 10 10:47:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe756615 dev-util/intel_clc: Migrate to llvm-r1 Closes: https://bugs.gentoo.org/923228 Signed-off-by: Michał Górny 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) - ) - =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