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

[Michał Górny]

commit:     e38cc94ced4b4ee67c3e6db7bc0d9aaa601a8887
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 08:44:43 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 08:45:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e38cc94c

sys-libs/libomp: Update the ebuild for 15.x

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

 sys-libs/libomp/libomp-15.0.0.9999.ebuild | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/sys-libs/libomp/libomp-15.0.0.9999.ebuild 
b/sys-libs/libomp/libomp-15.0.0.9999.ebuild
index 52f9f5285f11..5ded2b167951 100644
--- a/sys-libs/libomp/libomp-15.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-15.0.0.9999.ebuild
@@ -14,15 +14,10 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT 
)"
 SLOT="0"
 KEYWORDS=""
 IUSE="
-       cuda debug hwloc offload ompt test
+       debug hwloc offload ompt test
        llvm_targets_AMDGPU llvm_targets_NVPTX
 "
 RESTRICT="!test? ( test )"
-# CUDA works only with the x86_64 ABI
-REQUIRED_USE="
-       cuda? ( llvm_targets_NVPTX )
-       offload? ( cuda? ( abi_x86_64 ) )
-"
 
 RDEPEND="
        hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
@@ -30,7 +25,6 @@ RDEPEND="
                virtual/libelf:=[${MULTILIB_USEDEP}]
                dev-libs/libffi:=[${MULTILIB_USEDEP}]
                ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-               cuda? ( dev-util/nvidia-cuda-toolkit:= )
        )
 "
 # tests:
@@ -53,7 +47,7 @@ BDEPEND="
        )
 "
 
-LLVM_COMPONENTS=( openmp llvm/include )
+LLVM_COMPONENTS=( openmp cmake llvm/include )
 llvm.org_set_globals
 
 python_check_deps() {
@@ -104,20 +98,13 @@ multilib_src_configure() {
        if use offload; then
                if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
                        mycmakeargs+=(
-                               -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
-                               -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex 
llvm_targets_AMDGPU)
-                               -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex 
llvm_targets_NVPTX)
-                               # a cheap hack to force clang
-                               -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P 
"${CHOST}-clang")"
-                               # upstream defaults to looking for it in clang 
dir
-                               # this fails when ccache is being used
-                               -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P 
llvm-link)"
+                               -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex 
llvm_targets_AMDGPU)
+                               -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex 
llvm_targets_NVPTX)
                        )
                else
                        mycmakeargs+=(
-                               -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-                               -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
-                               -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
+                               -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
+                               -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
                        )
                fi
        fi