[gentoo-commits] repo/gentoo:master commit in: llvm-core/clang/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: llvm-core/clang/
Date: Thu, 12 Dec 2024 04:38:00 +0000 (UTC)	[thread overview]
Message-ID: <1733978236.aec36c6fbd87fab890fc4e53fe7c39dee49fdda5.sam@gentoo> (raw)

commit:     aec36c6fbd87fab890fc4e53fe7c39dee49fdda5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 04:32:34 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 04:37:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec36c6f

llvm-core/clang: drop llvm_prepend_path use

The hackery with PATH here is wrong and it breaks building Clang itself
with a different version of Clang (which is why we're looking at rejigging
how the eclass works/replacing it with llvm-r1.eclass [0]).

As suggested by Matt, use LLVM_CMAKE_DIR instead so that Clang finds
the right version of LLVM to build against without any sort of nonsense
messing with build tooling.

[0] https://public-inbox.gentoo.org/gentoo-dev/d5489fa24ef3d1129540879e628120addb3af8ce.camel <AT> gentoo.org/

Closes: https://bugs.gentoo.org/942314
Closes: https://bugs.gentoo.org/944788
Thanks-to: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 llvm-core/clang/clang-18.1.8-r6.ebuild          | 5 ++---
 llvm-core/clang/clang-19.1.4.ebuild             | 5 ++---
 llvm-core/clang/clang-19.1.5.ebuild             | 5 ++---
 llvm-core/clang/clang-20.0.0.9999.ebuild        | 5 ++---
 llvm-core/clang/clang-20.0.0_pre20241207.ebuild | 5 ++---
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/llvm-core/clang/clang-18.1.8-r6.ebuild b/llvm-core/clang/clang-18.1.8-r6.ebuild
index 52805e3df3fe..ecd51bb5ea94 100644
--- a/llvm-core/clang/clang-18.1.8-r6.ebuild
+++ b/llvm-core/clang/clang-18.1.8-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
+inherit cmake llvm.org multilib multilib-minimal
 inherit prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
@@ -255,12 +255,11 @@ 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}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DLLVM_CMAKE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/cmake"
 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
 		# relative to bindir
 		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"

diff --git a/llvm-core/clang/clang-19.1.4.ebuild b/llvm-core/clang/clang-19.1.4.ebuild
index 44fb3430d316..3167033c4a45 100644
--- a/llvm-core/clang/clang-19.1.4.ebuild
+++ b/llvm-core/clang/clang-19.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
+inherit cmake llvm.org multilib multilib-minimal
 inherit prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
@@ -254,12 +254,11 @@ 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}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DLLVM_CMAKE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/cmake"
 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
 		# relative to bindir
 		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"

diff --git a/llvm-core/clang/clang-19.1.5.ebuild b/llvm-core/clang/clang-19.1.5.ebuild
index dd0c7132c2d2..c994c37fe3eb 100644
--- a/llvm-core/clang/clang-19.1.5.ebuild
+++ b/llvm-core/clang/clang-19.1.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
+inherit cmake llvm.org multilib multilib-minimal
 inherit prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
@@ -254,12 +254,11 @@ 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}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DLLVM_CMAKE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/cmake"
 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
 		# relative to bindir
 		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"

diff --git a/llvm-core/clang/clang-20.0.0.9999.ebuild b/llvm-core/clang/clang-20.0.0.9999.ebuild
index 458b6079f63e..e85ebda1b26b 100644
--- a/llvm-core/clang/clang-20.0.0.9999.ebuild
+++ b/llvm-core/clang/clang-20.0.0.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
+inherit cmake llvm.org multilib multilib-minimal
 inherit prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
@@ -253,12 +253,11 @@ 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}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DLLVM_CMAKE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/cmake"
 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
 		# relative to bindir
 		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"

diff --git a/llvm-core/clang/clang-20.0.0_pre20241207.ebuild b/llvm-core/clang/clang-20.0.0_pre20241207.ebuild
index 458b6079f63e..e85ebda1b26b 100644
--- a/llvm-core/clang/clang-20.0.0_pre20241207.ebuild
+++ b/llvm-core/clang/clang-20.0.0_pre20241207.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake llvm.org llvm-utils multilib multilib-minimal
+inherit cmake llvm.org multilib multilib-minimal
 inherit prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
@@ -253,12 +253,11 @@ 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}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DLLVM_CMAKE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/cmake"
 		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
 		# relative to bindir
 		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"

next             reply	other threads:[~2024-12-12  4:38 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-12  4:38 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-16  5:57 [gentoo-commits] repo/gentoo:master commit in: llvm-core/clang/ Michał Górny
2024-12-17 21:37 Michał Górny
2024-12-18 14:07 Michał Górny
2024-12-21 10:28 Michał Górny
2024-12-27 21:25 Michał Górny
2024-12-28 19:35 Michał Górny
2025-01-03 15:25 James Le Cuirot
2025-01-04 15:28 Michał Górny
2025-01-11 18:12 Michał Górny
2025-01-15  4:24 Michał Górny
2025-01-18  8:21 Michał Górny
2025-01-18 15:09 Michał Górny
2025-01-22 19:15 Michał Górny
2025-01-25 13:33 Michał Górny
2025-01-31 21:51 Michał Górny
2025-02-01  8:05 Michał Górny
2025-02-01 13:15 Michał Górny
2025-02-02 18:25 Michał Górny
2025-02-07 20:08 Arthur Zamarin
2025-02-08 11:51 Michał Górny
2025-02-11 11:29 Michał Górny
2025-02-13  7:53 Michał Górny
2025-02-15  7:19 Michał Górny
2025-02-22 15:19 Michał Górny
2025-02-25 14:03 Michał Górny
2025-02-26 18:55 Michał Górny
2025-03-01  8:34 Michał Górny
2025-03-01 12:58 Michał Górny
2025-03-05  6:25 Michał Górny
2025-03-05 10:13 Michał Górny
2025-03-05 13:05 Michał Górny
2025-03-05 13:24 Michał Górny
2025-03-11 14:56 Michał Górny
2025-03-16 17:41 Michał Górny
2025-03-17 20:13 Michał Górny
2025-03-20 16:50 Michał Górny
2025-03-22 10:43 Michał Górny
2025-03-23 13:46 Arthur Zamarin
2025-03-23 13:46 Arthur Zamarin
2025-03-29 10:27 Michał Górny
2025-04-03 11:29 Michał Górny
2025-04-05 12:24 Michał Górny
2025-04-12  4:57 Michał Górny
2025-04-12  8:59 Michał Górny
2025-04-12 10:19 Arthur Zamarin
2025-04-12 10:21 Michał Górny
2025-04-15 10:15 Michał Górny
2025-04-16 18:34 Michał Górny
2025-04-19  6:29 Michał Górny
2025-04-20 11:50 Michał Górny
2025-04-26 15:59 Michał Górny
2025-05-03 10:07 Michał Górny
2025-05-03 19:42 Michał Górny
2025-05-10 13:03 Michał Górny

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:52805e3df3f dfblob:ecd51bb5ea9 dfblob:44fb3430d31
dfblob:3167033c4a4 dfblob:dd0c7132c2d dfblob:c994c37fe3e
dfblob:458b6079f63 dfblob:e85ebda1b26 dfblob:458b6079f63
dfblob:e85ebda1b26 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: llvm-core/clang/" )
	(help)

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=1733978236.aec36c6fbd87fab890fc4e53fe7c39dee49fdda5.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.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