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

[Michał Górny]

commit:     e7ec2441c01711625c04f0eaddefbe6b3d4178bc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 13:24:50 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 13:24:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ec2441

llvm-core/clang: Replace LLVM_CMAKE_DIR with LLVM_ROOT in 19.1.6+

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 llvm-core/clang/clang-19.1.6.ebuild      | 2 +-
 llvm-core/clang/clang-20.0.0.9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm-core/clang/clang-19.1.6.ebuild 
b/llvm-core/clang/clang-19.1.6.ebuild
index c994c37fe3eb..3d00c48770d8 100644
--- a/llvm-core/clang/clang-19.1.6.ebuild
+++ b/llvm-core/clang/clang-19.1.6.ebuild
@@ -258,7 +258,7 @@ multilib_src_configure() {
                -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"
+               -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
                -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 e85ebda1b26b..ffc1eb222985 100644
--- a/llvm-core/clang/clang-20.0.0.9999.ebuild
+++ b/llvm-core/clang/clang-20.0.0.9999.ebuild
@@ -257,7 +257,7 @@ multilib_src_configure() {
                -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"
+               -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
                -DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
                # relative to bindir
                -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"