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