[gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/

[Michał Górny]

commit:     a20c2820c7714304c5bf4ba36db65996fc20cd8e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 11:06:50 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 11:13:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20c2820

sys-libs/libomp: Migrate to llvm-utils

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

 sys-libs/libomp/libomp-18.1.0_rc2.ebuild         | 5 +++--
 sys-libs/libomp/libomp-19.0.0.9999.ebuild        | 5 +++--
 sys-libs/libomp/libomp-19.0.0_pre20240203.ebuild | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys-libs/libomp/libomp-18.1.0_rc2.ebuild 
b/sys-libs/libomp/libomp-18.1.0_rc2.ebuild
index 1d41ecc498a1..ce432b31535d 100644
--- a/sys-libs/libomp/libomp-18.1.0_rc2.ebuild
+++ b/sys-libs/libomp/libomp-18.1.0_rc2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
+inherit flag-o-matic cmake-multilib linux-info llvm.org llvm-utils
 inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
@@ -74,13 +74,14 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-       use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        if use gdb-plugin || use test; then
                python-single-r1_pkg_setup
        fi
 }
 
 multilib_src_configure() {
+       use offload && llvm_prepend_path "${LLVM_MAJOR}"
+
        # LTO causes issues in other packages building, #870127
        filter-lto
 

diff --git a/sys-libs/libomp/libomp-19.0.0.9999.ebuild 
b/sys-libs/libomp/libomp-19.0.0.9999.ebuild
index 1d41ecc498a1..ce432b31535d 100644
--- a/sys-libs/libomp/libomp-19.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-19.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
+inherit flag-o-matic cmake-multilib linux-info llvm.org llvm-utils
 inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
@@ -74,13 +74,14 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-       use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        if use gdb-plugin || use test; then
                python-single-r1_pkg_setup
        fi
 }
 
 multilib_src_configure() {
+       use offload && llvm_prepend_path "${LLVM_MAJOR}"
+
        # LTO causes issues in other packages building, #870127
        filter-lto
 

diff --git a/sys-libs/libomp/libomp-19.0.0_pre20240203.ebuild 
b/sys-libs/libomp/libomp-19.0.0_pre20240203.ebuild
index 1d41ecc498a1..ce432b31535d 100644
--- a/sys-libs/libomp/libomp-19.0.0_pre20240203.ebuild
+++ b/sys-libs/libomp/libomp-19.0.0_pre20240203.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
+inherit flag-o-matic cmake-multilib linux-info llvm.org llvm-utils
 inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
@@ -74,13 +74,14 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-       use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
        if use gdb-plugin || use test; then
                python-single-r1_pkg_setup
        fi
 }
 
 multilib_src_configure() {
+       use offload && llvm_prepend_path "${LLVM_MAJOR}"
+
        # LTO causes issues in other packages building, #870127
        filter-lto