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 0401215815E 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 396A4E2B26; Sat, 10 Feb 2024 11:13:18 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FA31E2B26 for ; Sat, 10 Feb 2024 11:13:18 +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 4AF5E3431D7 for ; Sat, 10 Feb 2024 11:13:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFFB714C5 for ; Sat, 10 Feb 2024 11:13:14 +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: <1707563585.41586251661d14b624f939f210b14d7fc77936ee.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-18.1.0_rc2.ebuild sys-devel/clang/clang-19.0.0.9999.ebuild sys-devel/clang/clang-19.0.0_pre20240203.ebuild X-VCS-Directories: sys-devel/clang/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 41586251661d14b624f939f210b14d7fc77936ee X-VCS-Branch: master Date: Sat, 10 Feb 2024 11:13:14 +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: 64ec6170-56a0-4d56-9d07-d3490856525b X-Archives-Hash: 6408ba83eb6ae5532176e090f1ce9c66 commit: 41586251661d14b624f939f210b14d7fc77936ee Author: Michał Górny gentoo org> AuthorDate: Sat Feb 10 10:56:06 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 10 11:13:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41586251 sys-devel/clang: Migrate to llvm-utils Signed-off-by: Michał Górny gentoo.org> sys-devel/clang/clang-18.1.0_rc2.ebuild | 9 +++------ sys-devel/clang/clang-19.0.0.9999.ebuild | 9 +++------ sys-devel/clang/clang-19.0.0_pre20240203.ebuild | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/sys-devel/clang/clang-18.1.0_rc2.ebuild b/sys-devel/clang/clang-18.1.0_rc2.ebuild index f5f1a7728b48..d351f9774a48 100644 --- a/sys-devel/clang/clang-18.1.0_rc2.ebuild +++ b/sys-devel/clang/clang-18.1.0_rc2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake llvm llvm.org multilib multilib-minimal +inherit cmake llvm.org llvm-utils multilib multilib-minimal inherit prefix python-single-r1 toolchain-funcs DESCRIPTION="C language family frontend for LLVM" @@ -66,11 +66,6 @@ llvm.org_set_globals # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need # multilib clang* libraries (not runtime, not wrappers). -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-single-r1_pkg_setup -} - src_prepare() { # create extra parent dir for relative CLANG_RESOURCE_DIR access mkdir -p x/y || die @@ -251,6 +246,8 @@ get_distribution_components() { } multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + local mycmakeargs=( -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}") -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" diff --git a/sys-devel/clang/clang-19.0.0.9999.ebuild b/sys-devel/clang/clang-19.0.0.9999.ebuild index f5f1a7728b48..d351f9774a48 100644 --- a/sys-devel/clang/clang-19.0.0.9999.ebuild +++ b/sys-devel/clang/clang-19.0.0.9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake llvm llvm.org multilib multilib-minimal +inherit cmake llvm.org llvm-utils multilib multilib-minimal inherit prefix python-single-r1 toolchain-funcs DESCRIPTION="C language family frontend for LLVM" @@ -66,11 +66,6 @@ llvm.org_set_globals # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need # multilib clang* libraries (not runtime, not wrappers). -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-single-r1_pkg_setup -} - src_prepare() { # create extra parent dir for relative CLANG_RESOURCE_DIR access mkdir -p x/y || die @@ -251,6 +246,8 @@ get_distribution_components() { } multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + local mycmakeargs=( -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}") -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" diff --git a/sys-devel/clang/clang-19.0.0_pre20240203.ebuild b/sys-devel/clang/clang-19.0.0_pre20240203.ebuild index f5f1a7728b48..d351f9774a48 100644 --- a/sys-devel/clang/clang-19.0.0_pre20240203.ebuild +++ b/sys-devel/clang/clang-19.0.0_pre20240203.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake llvm llvm.org multilib multilib-minimal +inherit cmake llvm.org llvm-utils multilib multilib-minimal inherit prefix python-single-r1 toolchain-funcs DESCRIPTION="C language family frontend for LLVM" @@ -66,11 +66,6 @@ llvm.org_set_globals # Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need # multilib clang* libraries (not runtime, not wrappers). -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-single-r1_pkg_setup -} - src_prepare() { # create extra parent dir for relative CLANG_RESOURCE_DIR access mkdir -p x/y || die @@ -251,6 +246,8 @@ get_distribution_components() { } multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + local mycmakeargs=( -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}") -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"