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/compiler-rt/
Date: Wed, 06 Jan 2021 21:23:59
Message-Id: 1609968205.2164bdae02d75a3a84d3802633616a044a6ac2d1.mgorny@gentoo
1 commit: 2164bdae02d75a3a84d3802633616a044a6ac2d1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 6 17:18:51 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 6 21:23:25 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2164bdae
7
8 sys-libs/compiler-rt: Remove 11.0.1 RCs and live
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt/Manifest | 2 -
13 .../compiler-rt/compiler-rt-11.0.1.9999.ebuild | 126 ---------------------
14 sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild | 126 ---------------------
15 sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild | 126 ---------------------
16 4 files changed, 380 deletions(-)
17
18 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
19 index 29b0efe3c21..47a7ff9f78f 100644
20 --- a/sys-libs/compiler-rt/Manifest
21 +++ b/sys-libs/compiler-rt/Manifest
22 @@ -1,6 +1,4 @@
23 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
24 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
25 -DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
26 -DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
27 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
28 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
29
30 diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild
31 deleted file mode 100644
32 index 07412646ab2..00000000000
33 --- a/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild
34 +++ /dev/null
35 @@ -1,126 +0,0 @@
36 -# Copyright 1999-2021 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -PYTHON_COMPAT=( python3_{6..9} )
42 -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
43 -
44 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
45 -HOMEPAGE="https://llvm.org/"
46 -
47 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
48 -SLOT="$(ver_cut 1-3)"
49 -KEYWORDS=""
50 -IUSE="+clang test"
51 -RESTRICT="!test? ( test ) !clang? ( test )"
52 -
53 -CLANG_SLOT=${SLOT%%.*}
54 -# llvm-6 for new lit options
55 -DEPEND="
56 - >=sys-devel/llvm-6"
57 -BDEPEND="
58 - >=dev-util/cmake-3.16
59 - clang? ( sys-devel/clang )
60 - test? (
61 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
62 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
63 - )
64 - ${PYTHON_DEPS}"
65 -
66 -LLVM_COMPONENTS=( compiler-rt )
67 -llvm.org_set_globals
68 -
69 -PATCHES=(
70 - "${FILESDIR}/9999/${PN}-prefix-paths.patch"
71 -)
72 -
73 -python_check_deps() {
74 - use test || return 0
75 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
76 -}
77 -
78 -pkg_pretend() {
79 - if ! use clang && ! tc-is-clang; then
80 - ewarn "Building using a compiler other than clang may result in broken atomics"
81 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
82 - fi
83 -}
84 -
85 -pkg_setup() {
86 - # Darwin Prefix builds do not have llvm installed yet, so rely on
87 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
88 - # of using llvm_pkg_setup.
89 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
90 - llvm_pkg_setup
91 - fi
92 - python-any-r1_pkg_setup
93 -}
94 -
95 -test_compiler() {
96 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
97 - <<<'int main() { return 0; }' &>/dev/null
98 -}
99 -
100 -src_configure() {
101 - # pre-set since we need to pass it to cmake
102 - BUILD_DIR=${WORKDIR}/${P}_build
103 -
104 - local nolib_flags=( -nodefaultlibs -lc )
105 - if use clang; then
106 - local -x CC=${CHOST}-clang
107 - local -x CXX=${CHOST}-clang++
108 - strip-unsupported-flags
109 - # ensure we can use clang before installing compiler-rt
110 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
111 - elif ! test_compiler; then
112 - if test_compiler "${nolib_flags[@]}"; then
113 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
114 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
115 - fi
116 - fi
117 -
118 - local mycmakeargs=(
119 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
120 -
121 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
122 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
123 - -DCOMPILER_RT_BUILD_PROFILE=OFF
124 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
125 - -DCOMPILER_RT_BUILD_XRAY=OFF
126 -
127 - -DPython3_EXECUTABLE="${PYTHON}"
128 - )
129 -
130 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
131 - mycmakeargs+=(
132 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
133 - # this allows adding arm64 support using SDK in EPREFIX
134 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
135 - # Set version based on the SDK in EPREFIX.
136 - # This disables i386 for SDK >= 10.15
137 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
138 - # Use our libtool instead of looking it up with xcrun
139 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
140 - )
141 - fi
142 -
143 - if use test; then
144 - mycmakeargs+=(
145 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
146 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
147 -
148 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
149 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
150 - )
151 - fi
152 -
153 - cmake_src_configure
154 -}
155 -
156 -src_test() {
157 - # respect TMPDIR!
158 - local -x LIT_PRESERVES_TMP=1
159 -
160 - cmake_build check-builtins
161 -}
162
163 diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild
164 deleted file mode 100644
165 index 07412646ab2..00000000000
166 --- a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild
167 +++ /dev/null
168 @@ -1,126 +0,0 @@
169 -# Copyright 1999-2021 Gentoo Authors
170 -# Distributed under the terms of the GNU General Public License v2
171 -
172 -EAPI=7
173 -
174 -PYTHON_COMPAT=( python3_{6..9} )
175 -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
176 -
177 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
178 -HOMEPAGE="https://llvm.org/"
179 -
180 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
181 -SLOT="$(ver_cut 1-3)"
182 -KEYWORDS=""
183 -IUSE="+clang test"
184 -RESTRICT="!test? ( test ) !clang? ( test )"
185 -
186 -CLANG_SLOT=${SLOT%%.*}
187 -# llvm-6 for new lit options
188 -DEPEND="
189 - >=sys-devel/llvm-6"
190 -BDEPEND="
191 - >=dev-util/cmake-3.16
192 - clang? ( sys-devel/clang )
193 - test? (
194 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
195 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
196 - )
197 - ${PYTHON_DEPS}"
198 -
199 -LLVM_COMPONENTS=( compiler-rt )
200 -llvm.org_set_globals
201 -
202 -PATCHES=(
203 - "${FILESDIR}/9999/${PN}-prefix-paths.patch"
204 -)
205 -
206 -python_check_deps() {
207 - use test || return 0
208 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
209 -}
210 -
211 -pkg_pretend() {
212 - if ! use clang && ! tc-is-clang; then
213 - ewarn "Building using a compiler other than clang may result in broken atomics"
214 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
215 - fi
216 -}
217 -
218 -pkg_setup() {
219 - # Darwin Prefix builds do not have llvm installed yet, so rely on
220 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
221 - # of using llvm_pkg_setup.
222 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
223 - llvm_pkg_setup
224 - fi
225 - python-any-r1_pkg_setup
226 -}
227 -
228 -test_compiler() {
229 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
230 - <<<'int main() { return 0; }' &>/dev/null
231 -}
232 -
233 -src_configure() {
234 - # pre-set since we need to pass it to cmake
235 - BUILD_DIR=${WORKDIR}/${P}_build
236 -
237 - local nolib_flags=( -nodefaultlibs -lc )
238 - if use clang; then
239 - local -x CC=${CHOST}-clang
240 - local -x CXX=${CHOST}-clang++
241 - strip-unsupported-flags
242 - # ensure we can use clang before installing compiler-rt
243 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
244 - elif ! test_compiler; then
245 - if test_compiler "${nolib_flags[@]}"; then
246 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
247 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
248 - fi
249 - fi
250 -
251 - local mycmakeargs=(
252 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
253 -
254 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
255 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
256 - -DCOMPILER_RT_BUILD_PROFILE=OFF
257 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
258 - -DCOMPILER_RT_BUILD_XRAY=OFF
259 -
260 - -DPython3_EXECUTABLE="${PYTHON}"
261 - )
262 -
263 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
264 - mycmakeargs+=(
265 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
266 - # this allows adding arm64 support using SDK in EPREFIX
267 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
268 - # Set version based on the SDK in EPREFIX.
269 - # This disables i386 for SDK >= 10.15
270 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
271 - # Use our libtool instead of looking it up with xcrun
272 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
273 - )
274 - fi
275 -
276 - if use test; then
277 - mycmakeargs+=(
278 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
279 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
280 -
281 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
282 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
283 - )
284 - fi
285 -
286 - cmake_src_configure
287 -}
288 -
289 -src_test() {
290 - # respect TMPDIR!
291 - local -x LIT_PRESERVES_TMP=1
292 -
293 - cmake_build check-builtins
294 -}
295
296 diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
297 deleted file mode 100644
298 index 07412646ab2..00000000000
299 --- a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
300 +++ /dev/null
301 @@ -1,126 +0,0 @@
302 -# Copyright 1999-2021 Gentoo Authors
303 -# Distributed under the terms of the GNU General Public License v2
304 -
305 -EAPI=7
306 -
307 -PYTHON_COMPAT=( python3_{6..9} )
308 -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
309 -
310 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
311 -HOMEPAGE="https://llvm.org/"
312 -
313 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
314 -SLOT="$(ver_cut 1-3)"
315 -KEYWORDS=""
316 -IUSE="+clang test"
317 -RESTRICT="!test? ( test ) !clang? ( test )"
318 -
319 -CLANG_SLOT=${SLOT%%.*}
320 -# llvm-6 for new lit options
321 -DEPEND="
322 - >=sys-devel/llvm-6"
323 -BDEPEND="
324 - >=dev-util/cmake-3.16
325 - clang? ( sys-devel/clang )
326 - test? (
327 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
328 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
329 - )
330 - ${PYTHON_DEPS}"
331 -
332 -LLVM_COMPONENTS=( compiler-rt )
333 -llvm.org_set_globals
334 -
335 -PATCHES=(
336 - "${FILESDIR}/9999/${PN}-prefix-paths.patch"
337 -)
338 -
339 -python_check_deps() {
340 - use test || return 0
341 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
342 -}
343 -
344 -pkg_pretend() {
345 - if ! use clang && ! tc-is-clang; then
346 - ewarn "Building using a compiler other than clang may result in broken atomics"
347 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
348 - fi
349 -}
350 -
351 -pkg_setup() {
352 - # Darwin Prefix builds do not have llvm installed yet, so rely on
353 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
354 - # of using llvm_pkg_setup.
355 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
356 - llvm_pkg_setup
357 - fi
358 - python-any-r1_pkg_setup
359 -}
360 -
361 -test_compiler() {
362 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
363 - <<<'int main() { return 0; }' &>/dev/null
364 -}
365 -
366 -src_configure() {
367 - # pre-set since we need to pass it to cmake
368 - BUILD_DIR=${WORKDIR}/${P}_build
369 -
370 - local nolib_flags=( -nodefaultlibs -lc )
371 - if use clang; then
372 - local -x CC=${CHOST}-clang
373 - local -x CXX=${CHOST}-clang++
374 - strip-unsupported-flags
375 - # ensure we can use clang before installing compiler-rt
376 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
377 - elif ! test_compiler; then
378 - if test_compiler "${nolib_flags[@]}"; then
379 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
380 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
381 - fi
382 - fi
383 -
384 - local mycmakeargs=(
385 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
386 -
387 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
388 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
389 - -DCOMPILER_RT_BUILD_PROFILE=OFF
390 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
391 - -DCOMPILER_RT_BUILD_XRAY=OFF
392 -
393 - -DPython3_EXECUTABLE="${PYTHON}"
394 - )
395 -
396 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
397 - mycmakeargs+=(
398 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
399 - # this allows adding arm64 support using SDK in EPREFIX
400 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
401 - # Set version based on the SDK in EPREFIX.
402 - # This disables i386 for SDK >= 10.15
403 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
404 - # Use our libtool instead of looking it up with xcrun
405 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
406 - )
407 - fi
408 -
409 - if use test; then
410 - mycmakeargs+=(
411 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
412 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
413 -
414 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
415 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
416 - )
417 - fi
418 -
419 - cmake_src_configure
420 -}
421 -
422 -src_test() {
423 - # respect TMPDIR!
424 - local -x LIT_PRESERVES_TMP=1
425 -
426 - cmake_build check-builtins
427 -}