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: Fri, 21 Jan 2022 15:38:32
Message-Id: 1642779451.b2de2c5d932c29ae887744bdd258ce05309ad8fa.mgorny@gentoo
1 commit: b2de2c5d932c29ae887744bdd258ce05309ad8fa
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 21 12:15:36 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 21 15:37:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2de2c5d
7
8 sys-libs/libomp: Remove 13.0.1-rc{1,2}
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libomp/Manifest | 4 -
13 sys-libs/libomp/libomp-13.0.1_rc1.ebuild | 131 -------------------------------
14 sys-libs/libomp/libomp-13.0.1_rc2.ebuild | 131 -------------------------------
15 3 files changed, 266 deletions(-)
16
17 diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
18 index f7c7ab5d41c8..378cdb597c9e 100644
19 --- a/sys-libs/libomp/Manifest
20 +++ b/sys-libs/libomp/Manifest
21 @@ -1,11 +1,7 @@
22 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
23 DIST llvm-gentoo-patchset-13.0.0-r2.tar.xz 6500 BLAKE2B 0ce8d0c4a5508f70c8ec49dbc03dfbfc6371ac224bc5dfc9a39f71def0f574405a06df5666baf6159afafd83a8028c5ea6cb369f22a06f927f3ce6795e96994d SHA512 800d44b382c03b673b43965d80d6ed1b7e8e4ced8d066183b9b8df722b2cc002a6aa54092e600f0d77611be581d312f8886ce8af25b23ff818115a209ec21312
24 -DIST llvm-gentoo-patchset-13.0.1-rc1.tar.xz 5988 BLAKE2B 8f1d295d4b6937518d9e0cc00cc2ba9e12ff9773b35261f0985b2d2a4ed1e3363a7f961cb385728b5ae552d0e129d99d11e63958d32c3353b0a79a88ba5cc0d5 SHA512 8272c423a5e0e99d412bb449794ba2e8134aca69d09e90e93555dbd3b7549d6ce4d68617ca11074af0a35a6f6830bf0330cbc672c5a56054cfd824e3ac1900ea
25 -DIST llvm-gentoo-patchset-13.0.1-rc2.tar.xz 5192 BLAKE2B 4a129a3d0b7c1839d79c814ea57602f5e87aadb9050fc8e91868d2c3773ff7ae8e2137f785deeded6925a4368220767526c95790c9883f2031edc3ebae25b13c SHA512 2f384281d06f5378f7d1b2f036958c7db00d1c4d799406fd188fa8388f0cf18279dae36f2fb37bff26daa91419ab1bc1c2390be0f3af42359f1aef8de81b6ac8
26 DIST llvm-gentoo-patchset-13.0.1-rc3.tar.xz 4808 BLAKE2B d8ed3ae424914437413e2e8c029880072e93d79ca79b842ad59451df46594c9b0d73ee5d49d3b65c4c7a40c86b2e0d43501ef106aea7c481f22425a5245a3411 SHA512 10430a720b120a340a681fa435a7f050741c75270607e3f5214bf829313d274c11f019f1ac072857dc5d7f868e6eb013932d1c94446e8cb2e151ac818a081914
27 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
28 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
29 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
30 -DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
31 -DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
32 DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
33
34 diff --git a/sys-libs/libomp/libomp-13.0.1_rc1.ebuild b/sys-libs/libomp/libomp-13.0.1_rc1.ebuild
35 deleted file mode 100644
36 index 6447245880b8..000000000000
37 --- a/sys-libs/libomp/libomp-13.0.1_rc1.ebuild
38 +++ /dev/null
39 @@ -1,131 +0,0 @@
40 -# Copyright 1999-2022 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=7
44 -
45 -CMAKE_ECLASS=cmake
46 -PYTHON_COMPAT=( python3_{8..10} )
47 -inherit cmake-multilib linux-info llvm llvm.org python-any-r1
48 -
49 -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
50 -HOMEPAGE="https://openmp.llvm.org"
51 -
52 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
53 -SLOT="0"
54 -KEYWORDS=""
55 -IUSE="cuda debug hwloc offload ompt test
56 - llvm_targets_AMDGPU llvm_targets_NVPTX"
57 -# CUDA works only with the x86_64 ABI
58 -REQUIRED_USE="
59 - cuda? ( llvm_targets_NVPTX )
60 - offload? ( cuda? ( abi_x86_64 ) )"
61 -RESTRICT="!test? ( test )"
62 -
63 -RDEPEND="
64 - hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
65 - offload? (
66 - virtual/libelf:=[${MULTILIB_USEDEP}]
67 - dev-libs/libffi:=[${MULTILIB_USEDEP}]
68 - ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
69 - cuda? ( dev-util/nvidia-cuda-toolkit:= )
70 - )"
71 -# tests:
72 -# - dev-python/lit provides the test runner
73 -# - sys-devel/llvm provide test utils (e.g. FileCheck)
74 -# - sys-devel/clang provides the compiler to run tests
75 -DEPEND="${RDEPEND}"
76 -BDEPEND="dev-lang/perl
77 - offload? (
78 - llvm_targets_AMDGPU? ( sys-devel/clang )
79 - llvm_targets_NVPTX? ( sys-devel/clang )
80 - virtual/pkgconfig
81 - )
82 - test? (
83 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
84 - sys-devel/clang
85 - )"
86 -
87 -LLVM_COMPONENTS=( openmp llvm/include )
88 -LLVM_PATCHSET=${PV/_/-}
89 -llvm.org_set_globals
90 -
91 -python_check_deps() {
92 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
93 -}
94 -
95 -kernel_pds_check() {
96 - if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
97 - local CONFIG_CHECK="~!SCHED_PDS"
98 - local ERROR_SCHED_PDS="\
99 -PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
100 -< 4.14-pf9) do not implement sched_yield() call which may result in horrible
101 -performance problems with libomp. If you are using one of the specified
102 -kernel versions, you may want to disable the PDS scheduler."
103 -
104 - check_extra_config
105 - fi
106 -}
107 -
108 -pkg_pretend() {
109 - kernel_pds_check
110 -}
111 -
112 -pkg_setup() {
113 - use offload && LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
114 - use test && python-any-r1_pkg_setup
115 -}
116 -
117 -multilib_src_configure() {
118 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
119 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
120 -
121 - local libdir="$(get_libdir)"
122 - local mycmakeargs=(
123 - -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
124 -
125 - -DLIBOMP_USE_HWLOC=$(usex hwloc)
126 - -DLIBOMP_OMPT_SUPPORT=$(usex ompt)
127 -
128 - -DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
129 -
130 - # do not install libgomp.so & libiomp5.so aliases
131 - -DLIBOMP_INSTALL_ALIASES=OFF
132 - # disable unnecessary hack copying stuff back to srcdir
133 - -DLIBOMP_COPY_EXPORTS=OFF
134 - )
135 - if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
136 - mycmakeargs+=(
137 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
138 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
139 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
140 - # a cheap hack to force clang
141 - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
142 - # upstream defaults to looking for it in clang dir
143 - # this fails when ccache is being used
144 - -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
145 - )
146 - else
147 - mycmakeargs+=(
148 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
149 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
150 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
151 - )
152 - fi
153 - use test && mycmakeargs+=(
154 - # this project does not use standard LLVM cmake macros
155 - -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
156 - -DOPENMP_LIT_ARGS="$(get_lit_flags)"
157 -
158 - -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
159 - -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
160 - )
161 - addpredict /dev/nvidiactl
162 - cmake_src_configure
163 -}
164 -
165 -multilib_src_test() {
166 - # respect TMPDIR!
167 - local -x LIT_PRESERVES_TMP=1
168 -
169 - cmake_build check-libomp
170 -}
171
172 diff --git a/sys-libs/libomp/libomp-13.0.1_rc2.ebuild b/sys-libs/libomp/libomp-13.0.1_rc2.ebuild
173 deleted file mode 100644
174 index 6447245880b8..000000000000
175 --- a/sys-libs/libomp/libomp-13.0.1_rc2.ebuild
176 +++ /dev/null
177 @@ -1,131 +0,0 @@
178 -# Copyright 1999-2022 Gentoo Authors
179 -# Distributed under the terms of the GNU General Public License v2
180 -
181 -EAPI=7
182 -
183 -CMAKE_ECLASS=cmake
184 -PYTHON_COMPAT=( python3_{8..10} )
185 -inherit cmake-multilib linux-info llvm llvm.org python-any-r1
186 -
187 -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
188 -HOMEPAGE="https://openmp.llvm.org"
189 -
190 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
191 -SLOT="0"
192 -KEYWORDS=""
193 -IUSE="cuda debug hwloc offload ompt test
194 - llvm_targets_AMDGPU llvm_targets_NVPTX"
195 -# CUDA works only with the x86_64 ABI
196 -REQUIRED_USE="
197 - cuda? ( llvm_targets_NVPTX )
198 - offload? ( cuda? ( abi_x86_64 ) )"
199 -RESTRICT="!test? ( test )"
200 -
201 -RDEPEND="
202 - hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
203 - offload? (
204 - virtual/libelf:=[${MULTILIB_USEDEP}]
205 - dev-libs/libffi:=[${MULTILIB_USEDEP}]
206 - ~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
207 - cuda? ( dev-util/nvidia-cuda-toolkit:= )
208 - )"
209 -# tests:
210 -# - dev-python/lit provides the test runner
211 -# - sys-devel/llvm provide test utils (e.g. FileCheck)
212 -# - sys-devel/clang provides the compiler to run tests
213 -DEPEND="${RDEPEND}"
214 -BDEPEND="dev-lang/perl
215 - offload? (
216 - llvm_targets_AMDGPU? ( sys-devel/clang )
217 - llvm_targets_NVPTX? ( sys-devel/clang )
218 - virtual/pkgconfig
219 - )
220 - test? (
221 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
222 - sys-devel/clang
223 - )"
224 -
225 -LLVM_COMPONENTS=( openmp llvm/include )
226 -LLVM_PATCHSET=${PV/_/-}
227 -llvm.org_set_globals
228 -
229 -python_check_deps() {
230 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
231 -}
232 -
233 -kernel_pds_check() {
234 - if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
235 - local CONFIG_CHECK="~!SCHED_PDS"
236 - local ERROR_SCHED_PDS="\
237 -PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
238 -< 4.14-pf9) do not implement sched_yield() call which may result in horrible
239 -performance problems with libomp. If you are using one of the specified
240 -kernel versions, you may want to disable the PDS scheduler."
241 -
242 - check_extra_config
243 - fi
244 -}
245 -
246 -pkg_pretend() {
247 - kernel_pds_check
248 -}
249 -
250 -pkg_setup() {
251 - use offload && LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
252 - use test && python-any-r1_pkg_setup
253 -}
254 -
255 -multilib_src_configure() {
256 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
257 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
258 -
259 - local libdir="$(get_libdir)"
260 - local mycmakeargs=(
261 - -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
262 -
263 - -DLIBOMP_USE_HWLOC=$(usex hwloc)
264 - -DLIBOMP_OMPT_SUPPORT=$(usex ompt)
265 -
266 - -DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
267 -
268 - # do not install libgomp.so & libiomp5.so aliases
269 - -DLIBOMP_INSTALL_ALIASES=OFF
270 - # disable unnecessary hack copying stuff back to srcdir
271 - -DLIBOMP_COPY_EXPORTS=OFF
272 - )
273 - if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
274 - mycmakeargs+=(
275 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
276 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
277 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
278 - # a cheap hack to force clang
279 - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
280 - # upstream defaults to looking for it in clang dir
281 - # this fails when ccache is being used
282 - -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
283 - )
284 - else
285 - mycmakeargs+=(
286 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
287 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
288 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
289 - )
290 - fi
291 - use test && mycmakeargs+=(
292 - # this project does not use standard LLVM cmake macros
293 - -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
294 - -DOPENMP_LIT_ARGS="$(get_lit_flags)"
295 -
296 - -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
297 - -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
298 - )
299 - addpredict /dev/nvidiactl
300 - cmake_src_configure
301 -}
302 -
303 -multilib_src_test() {
304 - # respect TMPDIR!
305 - local -x LIT_PRESERVES_TMP=1
306 -
307 - cmake_build check-libomp
308 -}