commit: 41586251661d14b624f939f210b14d7fc77936ee
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 10:56:06 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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}"
