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 D3CFA15815E for ; Sat, 10 Feb 2024 11:13:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AD43E2B28; Sat, 10 Feb 2024 11:13:19 +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 1FA44E2B2D for ; Sat, 10 Feb 2024 11:13:19 +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 66B233431D7 for ; Sat, 10 Feb 2024 11:13:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99A9D14D3 for ; Sat, 10 Feb 2024 11:13:15 +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: <1707563591.e61d174a4f1e0ebe62f2b684d74fb15256928ffc.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libclc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libclc/libclc-18.1.0_rc2.ebuild dev-libs/libclc/libclc-19.0.0.9999.ebuild dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild X-VCS-Directories: dev-libs/libclc/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e61d174a4f1e0ebe62f2b684d74fb15256928ffc X-VCS-Branch: master Date: Sat, 10 Feb 2024 11:13:15 +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: aab4470d-55df-49ce-a768-53fae53f8242 X-Archives-Hash: 9791763a5546230ac6cdfeff0fa85393 commit: e61d174a4f1e0ebe62f2b684d74fb15256928ffc Author: Michał Górny gentoo org> AuthorDate: Sat Feb 10 11:10:38 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 10 11:13:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61d174a dev-libs/libclc: Migrate to llvm-r1 Signed-off-by: Michał Górny gentoo.org> dev-libs/libclc/libclc-18.1.0_rc2.ebuild | 40 +++++------------------- dev-libs/libclc/libclc-19.0.0.9999.ebuild | 40 +++++------------------- dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild | 40 +++++------------------- 3 files changed, 21 insertions(+), 99 deletions(-) diff --git a/dev-libs/libclc/libclc-18.1.0_rc2.ebuild b/dev-libs/libclc/libclc-18.1.0_rc2.ebuild index 70dacd0cf8da..15a69aca7556 100644 --- a/dev-libs/libclc/libclc-18.1.0_rc2.ebuild +++ b/dev-libs/libclc/libclc-18.1.0_rc2.ebuild @@ -3,8 +3,9 @@ EAPI=8 +LLVM_COMPAT=( {15..17} ) PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake llvm llvm.org python-any-r1 +inherit cmake llvm.org llvm-r1 python-any-r1 DESCRIPTION="OpenCL C library" HOMEPAGE="https://libclc.llvm.org/" @@ -13,46 +14,19 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" SLOT="0" IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi" -LLVM_MAX_SLOT=17 BDEPEND=" ${PYTHON_DEPS} - || ( - ( - sys-devel/clang:17 - spirv? ( dev-util/spirv-llvm-translator:17 ) - ) - ( - sys-devel/clang:16 - spirv? ( dev-util/spirv-llvm-translator:16 ) - ) - ( - sys-devel/clang:15 - spirv? ( dev-util/spirv-llvm-translator:15 ) - ) - ( - sys-devel/clang:14 - spirv? ( dev-util/spirv-llvm-translator:14 ) - ) - ( - sys-devel/clang:13 - spirv? ( dev-util/spirv-llvm-translator:13 ) - ) - ) + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} ) + ') " LLVM_COMPONENTS=( libclc ) llvm.org_set_globals -llvm_check_deps() { - if use spirv; then - has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || - return 1 - fi - has_version -b "sys-devel/clang:${LLVM_SLOT}" -} - pkg_setup() { - llvm_pkg_setup + llvm-r1_pkg_setup python-any-r1_pkg_setup } diff --git a/dev-libs/libclc/libclc-19.0.0.9999.ebuild b/dev-libs/libclc/libclc-19.0.0.9999.ebuild index 70dacd0cf8da..15a69aca7556 100644 --- a/dev-libs/libclc/libclc-19.0.0.9999.ebuild +++ b/dev-libs/libclc/libclc-19.0.0.9999.ebuild @@ -3,8 +3,9 @@ EAPI=8 +LLVM_COMPAT=( {15..17} ) PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake llvm llvm.org python-any-r1 +inherit cmake llvm.org llvm-r1 python-any-r1 DESCRIPTION="OpenCL C library" HOMEPAGE="https://libclc.llvm.org/" @@ -13,46 +14,19 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" SLOT="0" IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi" -LLVM_MAX_SLOT=17 BDEPEND=" ${PYTHON_DEPS} - || ( - ( - sys-devel/clang:17 - spirv? ( dev-util/spirv-llvm-translator:17 ) - ) - ( - sys-devel/clang:16 - spirv? ( dev-util/spirv-llvm-translator:16 ) - ) - ( - sys-devel/clang:15 - spirv? ( dev-util/spirv-llvm-translator:15 ) - ) - ( - sys-devel/clang:14 - spirv? ( dev-util/spirv-llvm-translator:14 ) - ) - ( - sys-devel/clang:13 - spirv? ( dev-util/spirv-llvm-translator:13 ) - ) - ) + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} ) + ') " LLVM_COMPONENTS=( libclc ) llvm.org_set_globals -llvm_check_deps() { - if use spirv; then - has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || - return 1 - fi - has_version -b "sys-devel/clang:${LLVM_SLOT}" -} - pkg_setup() { - llvm_pkg_setup + llvm-r1_pkg_setup python-any-r1_pkg_setup } diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild index 70dacd0cf8da..15a69aca7556 100644 --- a/dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild +++ b/dev-libs/libclc/libclc-19.0.0_pre20240203.ebuild @@ -3,8 +3,9 @@ EAPI=8 +LLVM_COMPAT=( {15..17} ) PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake llvm llvm.org python-any-r1 +inherit cmake llvm.org llvm-r1 python-any-r1 DESCRIPTION="OpenCL C library" HOMEPAGE="https://libclc.llvm.org/" @@ -13,46 +14,19 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" SLOT="0" IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi" -LLVM_MAX_SLOT=17 BDEPEND=" ${PYTHON_DEPS} - || ( - ( - sys-devel/clang:17 - spirv? ( dev-util/spirv-llvm-translator:17 ) - ) - ( - sys-devel/clang:16 - spirv? ( dev-util/spirv-llvm-translator:16 ) - ) - ( - sys-devel/clang:15 - spirv? ( dev-util/spirv-llvm-translator:15 ) - ) - ( - sys-devel/clang:14 - spirv? ( dev-util/spirv-llvm-translator:14 ) - ) - ( - sys-devel/clang:13 - spirv? ( dev-util/spirv-llvm-translator:13 ) - ) - ) + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} ) + ') " LLVM_COMPONENTS=( libclc ) llvm.org_set_globals -llvm_check_deps() { - if use spirv; then - has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || - return 1 - fi - has_version -b "sys-devel/clang:${LLVM_SLOT}" -} - pkg_setup() { - llvm_pkg_setup + llvm-r1_pkg_setup python-any-r1_pkg_setup }