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, 04 Mar 2020 18:39:17
Message-Id: 1583347142.43da886221d8764acf6f4526553d0074f5d4adf5.mgorny@gentoo
1 commit: 43da886221d8764acf6f4526553d0074f5d4adf5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 18:12:54 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 18:39:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43da8862
7
8 sys-libs/libomp: Remove 10.0.0rc[12]
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libomp/Manifest | 2 -
13 sys-libs/libomp/libomp-10.0.0_rc1.ebuild | 106 -------------------------------
14 sys-libs/libomp/libomp-10.0.0_rc2.ebuild | 106 -------------------------------
15 3 files changed, 214 deletions(-)
16
17 diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
18 index 9ccf64c5f34..64768da518d 100644
19 --- a/sys-libs/libomp/Manifest
20 +++ b/sys-libs/libomp/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
23 -DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
24 DIST llvmorg-10.0.0-rc3.tar.gz 120814170 BLAKE2B 432fe0c1e74d3020a269a256e6e456cbfa0b7166dd3f86df6caf3a55e1931c022285fe8afdc4d8998c729c5471acf5308abb336782ddec2ef9b0f58d1ccb5a3c SHA512 aad1df86063612d20c48ea7046940330fe2ac572a146be22ff71d9e65fa3438184cb39a2533fc6afd1e74df26909a9f0d24ebcd7d62e74728cfd81e447f2ffbf
25 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
26 DIST openmp-7.1.0.src.tar.xz 909320 BLAKE2B 7a5fd4374992b7c440ff27917c0af6a2ec64aaeb2fda645f75b5affd4981e3ceef7f15cba61c37934c5b35be543af315cc4bff2937545fbf5eaa6593f1aa8b83 SHA512 57f18beede401c1c39766e13a03b52083a0f7b437758069f66b73d6d1388dc51e48c34b0a7ecd3552244fd35e2db57388642588febef413c161f5c5411ab1e5d
27
28 diff --git a/sys-libs/libomp/libomp-10.0.0_rc1.ebuild b/sys-libs/libomp/libomp-10.0.0_rc1.ebuild
29 deleted file mode 100644
30 index 40ae69e436c..00000000000
31 --- a/sys-libs/libomp/libomp-10.0.0_rc1.ebuild
32 +++ /dev/null
33 @@ -1,106 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{6,7} )
40 -inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
41 -
42 -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
43 -HOMEPAGE="https://openmp.llvm.org"
44 -LLVM_COMPONENTS=( openmp )
45 -llvm.org_set_globals
46 -
47 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
48 -SLOT="0"
49 -KEYWORDS=""
50 -IUSE="cuda hwloc kernel_linux offload ompt test"
51 -# CUDA works only with the x86_64 ABI
52 -REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
53 -RESTRICT="!test? ( test )"
54 -
55 -RDEPEND="
56 - hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
57 - offload? (
58 - virtual/libelf:=[${MULTILIB_USEDEP}]
59 - dev-libs/libffi:=[${MULTILIB_USEDEP}]
60 - cuda? ( dev-util/nvidia-cuda-toolkit:= )
61 - )"
62 -# tests:
63 -# - dev-python/lit provides the test runner
64 -# - sys-devel/llvm provide test utils (e.g. FileCheck)
65 -# - sys-devel/clang provides the compiler to run tests
66 -DEPEND="${RDEPEND}"
67 -BDEPEND="dev-lang/perl
68 - offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
69 - test? (
70 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
71 - >=sys-devel/clang-6
72 - )"
73 -
74 -# least intrusive of all
75 -CMAKE_BUILD_TYPE=RelWithDebInfo
76 -
77 -python_check_deps() {
78 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
79 -}
80 -
81 -kernel_pds_check() {
82 - if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
83 - local CONFIG_CHECK="~!SCHED_PDS"
84 - local ERROR_SCHED_PDS="\
85 -PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
86 -< 4.14-pf9) do not implement sched_yield() call which may result in horrible
87 -performance problems with libomp. If you are using one of the specified
88 -kernel versions, you may want to disable the PDS scheduler."
89 -
90 - check_extra_config
91 - fi
92 -}
93 -
94 -pkg_pretend() {
95 - kernel_pds_check
96 -}
97 -
98 -pkg_setup() {
99 - use test && python-any-r1_pkg_setup
100 -}
101 -
102 -multilib_src_configure() {
103 - local libdir="$(get_libdir)"
104 - local mycmakeargs=(
105 - -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
106 -
107 - -DLIBOMP_USE_HWLOC=$(usex hwloc)
108 - -DLIBOMP_OMPT_SUPPORT=$(usex ompt)
109 -
110 - -DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
111 -
112 - # do not install libgomp.so & libiomp5.so aliases
113 - -DLIBOMP_INSTALL_ALIASES=OFF
114 - # disable unnecessary hack copying stuff back to srcdir
115 - -DLIBOMP_COPY_EXPORTS=OFF
116 - )
117 - use offload && mycmakeargs+=(
118 - # this is non-fatal and libomp checks for CUDA conditionally
119 - # to ABI, so we can just ignore passing the wrong value
120 - # on non-amd64 ABIs
121 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
122 - )
123 - use test && mycmakeargs+=(
124 - # this project does not use standard LLVM cmake macros
125 - -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
126 - -DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
127 -
128 - -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
129 - -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
130 - )
131 - cmake-utils_src_configure
132 -}
133 -
134 -multilib_src_test() {
135 - # respect TMPDIR!
136 - local -x LIT_PRESERVES_TMP=1
137 -
138 - cmake-utils_src_make check-libomp
139 -}
140
141 diff --git a/sys-libs/libomp/libomp-10.0.0_rc2.ebuild b/sys-libs/libomp/libomp-10.0.0_rc2.ebuild
142 deleted file mode 100644
143 index aa0be13c4ba..00000000000
144 --- a/sys-libs/libomp/libomp-10.0.0_rc2.ebuild
145 +++ /dev/null
146 @@ -1,106 +0,0 @@
147 -# Copyright 1999-2020 Gentoo Authors
148 -# Distributed under the terms of the GNU General Public License v2
149 -
150 -EAPI=7
151 -
152 -PYTHON_COMPAT=( python3_{6,7,8} )
153 -inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
154 -
155 -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
156 -HOMEPAGE="https://openmp.llvm.org"
157 -LLVM_COMPONENTS=( openmp )
158 -llvm.org_set_globals
159 -
160 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
161 -SLOT="0"
162 -KEYWORDS=""
163 -IUSE="cuda hwloc kernel_linux offload ompt test"
164 -# CUDA works only with the x86_64 ABI
165 -REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
166 -RESTRICT="!test? ( test )"
167 -
168 -RDEPEND="
169 - hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
170 - offload? (
171 - virtual/libelf:=[${MULTILIB_USEDEP}]
172 - dev-libs/libffi:=[${MULTILIB_USEDEP}]
173 - cuda? ( dev-util/nvidia-cuda-toolkit:= )
174 - )"
175 -# tests:
176 -# - dev-python/lit provides the test runner
177 -# - sys-devel/llvm provide test utils (e.g. FileCheck)
178 -# - sys-devel/clang provides the compiler to run tests
179 -DEPEND="${RDEPEND}"
180 -BDEPEND="dev-lang/perl
181 - offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
182 - test? (
183 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
184 - >=sys-devel/clang-6
185 - )"
186 -
187 -# least intrusive of all
188 -CMAKE_BUILD_TYPE=RelWithDebInfo
189 -
190 -python_check_deps() {
191 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
192 -}
193 -
194 -kernel_pds_check() {
195 - if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
196 - local CONFIG_CHECK="~!SCHED_PDS"
197 - local ERROR_SCHED_PDS="\
198 -PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
199 -< 4.14-pf9) do not implement sched_yield() call which may result in horrible
200 -performance problems with libomp. If you are using one of the specified
201 -kernel versions, you may want to disable the PDS scheduler."
202 -
203 - check_extra_config
204 - fi
205 -}
206 -
207 -pkg_pretend() {
208 - kernel_pds_check
209 -}
210 -
211 -pkg_setup() {
212 - use test && python-any-r1_pkg_setup
213 -}
214 -
215 -multilib_src_configure() {
216 - local libdir="$(get_libdir)"
217 - local mycmakeargs=(
218 - -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
219 -
220 - -DLIBOMP_USE_HWLOC=$(usex hwloc)
221 - -DLIBOMP_OMPT_SUPPORT=$(usex ompt)
222 -
223 - -DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
224 -
225 - # do not install libgomp.so & libiomp5.so aliases
226 - -DLIBOMP_INSTALL_ALIASES=OFF
227 - # disable unnecessary hack copying stuff back to srcdir
228 - -DLIBOMP_COPY_EXPORTS=OFF
229 - )
230 - use offload && mycmakeargs+=(
231 - # this is non-fatal and libomp checks for CUDA conditionally
232 - # to ABI, so we can just ignore passing the wrong value
233 - # on non-amd64 ABIs
234 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
235 - )
236 - use test && mycmakeargs+=(
237 - # this project does not use standard LLVM cmake macros
238 - -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
239 - -DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
240 -
241 - -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
242 - -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
243 - )
244 - cmake-utils_src_configure
245 -}
246 -
247 -multilib_src_test() {
248 - # respect TMPDIR!
249 - local -x LIT_PRESERVES_TMP=1
250 -
251 - cmake-utils_src_make check-libomp
252 -}