Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/
Date: Wed, 27 Apr 2022 12:27:20
Message-Id: 1651062423.879bfb5cececf0fb2ecbf40648ac6ae2a1cec29b.mgorny@gentoo
1 commit: 879bfb5cececf0fb2ecbf40648ac6ae2a1cec29b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 27 08:35:16 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 27 12:27:03 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=879bfb5c
7
8 sys-libs/libomp: Modernize
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libomp/libomp-15.0.0.9999.ebuild | 26 +++++++++++++++++---------
13 1 file changed, 17 insertions(+), 9 deletions(-)
14
15 diff --git a/sys-libs/libomp/libomp-15.0.0.9999.ebuild b/sys-libs/libomp/libomp-15.0.0.9999.ebuild
16 index dbee89f1997c..52f9f5285f11 100644
17 --- a/sys-libs/libomp/libomp-15.0.0.9999.ebuild
18 +++ b/sys-libs/libomp/libomp-15.0.0.9999.ebuild
19 @@ -1,7 +1,7 @@
20 # Copyright 1999-2022 Gentoo Authors
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI=7
24 +EAPI=8
25
26 CMAKE_ECLASS=cmake
27 PYTHON_COMPAT=( python3_{8..10} )
28 @@ -13,13 +13,16 @@ HOMEPAGE="https://openmp.llvm.org"
29 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
30 SLOT="0"
31 KEYWORDS=""
32 -IUSE="cuda debug hwloc offload ompt test
33 - llvm_targets_AMDGPU llvm_targets_NVPTX"
34 +IUSE="
35 + cuda debug hwloc offload ompt test
36 + llvm_targets_AMDGPU llvm_targets_NVPTX
37 +"
38 +RESTRICT="!test? ( test )"
39 # CUDA works only with the x86_64 ABI
40 REQUIRED_USE="
41 cuda? ( llvm_targets_NVPTX )
42 - offload? ( cuda? ( abi_x86_64 ) )"
43 -RESTRICT="!test? ( test )"
44 + offload? ( cuda? ( abi_x86_64 ) )
45 +"
46
47 RDEPEND="
48 hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
49 @@ -28,13 +31,17 @@ RDEPEND="
50 dev-libs/libffi:=[${MULTILIB_USEDEP}]
51 ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
52 cuda? ( dev-util/nvidia-cuda-toolkit:= )
53 - )"
54 + )
55 +"
56 # tests:
57 # - dev-python/lit provides the test runner
58 # - sys-devel/llvm provide test utils (e.g. FileCheck)
59 # - sys-devel/clang provides the compiler to run tests
60 -DEPEND="${RDEPEND}"
61 -BDEPEND="dev-lang/perl
62 +DEPEND="
63 + ${RDEPEND}
64 +"
65 +BDEPEND="
66 + dev-lang/perl
67 offload? (
68 llvm_targets_AMDGPU? ( sys-devel/clang )
69 llvm_targets_NVPTX? ( sys-devel/clang )
70 @@ -43,7 +50,8 @@ BDEPEND="dev-lang/perl
71 test? (
72 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
73 sys-devel/clang
74 - )"
75 + )
76 +"
77
78 LLVM_COMPONENTS=( openmp llvm/include )
79 llvm.org_set_globals