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: Fri, 21 Jan 2022 15:38:36
Message-Id: 1642779455.ea8a3dff7c2c6be5db76d02ca9128c1d0325a25c.mgorny@gentoo
1 commit: ea8a3dff7c2c6be5db76d02ca9128c1d0325a25c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 21 12:15:41 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 21 15:37:35 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8a3dff
7
8 sys-libs/compiler-rt: Remove 13.0.1-rc{1,2}
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt/Manifest | 4 -
13 sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild | 137 ---------------------
14 sys-libs/compiler-rt/compiler-rt-13.0.1_rc2.ebuild | 137 ---------------------
15 3 files changed, 278 deletions(-)
16
17 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
18 index 429078f407a1..45e9d7a057c0 100644
19 --- a/sys-libs/compiler-rt/Manifest
20 +++ b/sys-libs/compiler-rt/Manifest
21 @@ -1,13 +1,9 @@
22 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
23 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
24 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
25 -DIST llvm-gentoo-patchset-13.0.1-rc1.tar.xz 5988 BLAKE2B 8f1d295d4b6937518d9e0cc00cc2ba9e12ff9773b35261f0985b2d2a4ed1e3363a7f961cb385728b5ae552d0e129d99d11e63958d32c3353b0a79a88ba5cc0d5 SHA512 8272c423a5e0e99d412bb449794ba2e8134aca69d09e90e93555dbd3b7549d6ce4d68617ca11074af0a35a6f6830bf0330cbc672c5a56054cfd824e3ac1900ea
26 -DIST llvm-gentoo-patchset-13.0.1-rc2.tar.xz 5192 BLAKE2B 4a129a3d0b7c1839d79c814ea57602f5e87aadb9050fc8e91868d2c3773ff7ae8e2137f785deeded6925a4368220767526c95790c9883f2031edc3ebae25b13c SHA512 2f384281d06f5378f7d1b2f036958c7db00d1c4d799406fd188fa8388f0cf18279dae36f2fb37bff26daa91419ab1bc1c2390be0f3af42359f1aef8de81b6ac8
27 DIST llvm-gentoo-patchset-13.0.1-rc3.tar.xz 4808 BLAKE2B d8ed3ae424914437413e2e8c029880072e93d79ca79b842ad59451df46594c9b0d73ee5d49d3b65c4c7a40c86b2e0d43501ef106aea7c481f22425a5245a3411 SHA512 10430a720b120a340a681fa435a7f050741c75270607e3f5214bf829313d274c11f019f1ac072857dc5d7f868e6eb013932d1c94446e8cb2e151ac818a081914
28 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
29 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
30 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
31 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
32 -DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
33 -DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
34 DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
35
36 diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild
37 deleted file mode 100644
38 index b2851d32c00e..000000000000
39 --- a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild
40 +++ /dev/null
41 @@ -1,137 +0,0 @@
42 -# Copyright 1999-2021 Gentoo Authors
43 -# Distributed under the terms of the GNU General Public License v2
44 -
45 -EAPI=7
46 -
47 -PYTHON_COMPAT=( python3_{8..10} )
48 -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
49 -
50 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
51 -HOMEPAGE="https://llvm.org/"
52 -
53 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
54 -SLOT="$(ver_cut 1-3)"
55 -KEYWORDS=""
56 -IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
57 -RESTRICT="!test? ( test ) !clang? ( test )"
58 -
59 -CLANG_SLOT=${SLOT%%.*}
60 -# llvm-6 for new lit options
61 -DEPEND="
62 - >=sys-devel/llvm-6"
63 -BDEPEND="
64 - >=dev-util/cmake-3.16
65 - clang? ( sys-devel/clang )
66 - test? (
67 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
68 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
69 - )
70 - !test? (
71 - ${PYTHON_DEPS}
72 - )"
73 -
74 -LLVM_COMPONENTS=( compiler-rt )
75 -LLVM_PATCHSET=${PV/_/-}
76 -llvm.org_set_globals
77 -
78 -python_check_deps() {
79 - use test || return 0
80 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
81 -}
82 -
83 -pkg_pretend() {
84 - if ! use clang && ! tc-is-clang; then
85 - ewarn "Building using a compiler other than clang may result in broken atomics"
86 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
87 - fi
88 -}
89 -
90 -pkg_setup() {
91 - # Darwin Prefix builds do not have llvm installed yet, so rely on
92 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
93 - # of using llvm_pkg_setup.
94 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
95 - llvm_pkg_setup
96 - fi
97 - python-any-r1_pkg_setup
98 -}
99 -
100 -test_compiler() {
101 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
102 - <<<'int main() { return 0; }' &>/dev/null
103 -}
104 -
105 -src_configure() {
106 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
107 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
108 -
109 - # pre-set since we need to pass it to cmake
110 - BUILD_DIR=${WORKDIR}/${P}_build
111 -
112 - local nolib_flags=( -nodefaultlibs -lc )
113 - if use clang; then
114 - local -x CC=${CHOST}-clang
115 - local -x CXX=${CHOST}-clang++
116 - strip-unsupported-flags
117 - # ensure we can use clang before installing compiler-rt
118 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
119 - elif ! test_compiler; then
120 - if test_compiler "${nolib_flags[@]}"; then
121 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
122 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
123 - fi
124 - fi
125 -
126 - local mycmakeargs=(
127 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
128 -
129 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
130 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
131 - -DCOMPILER_RT_BUILD_MEMPROF=OFF
132 - -DCOMPILER_RT_BUILD_ORC=OFF
133 - -DCOMPILER_RT_BUILD_PROFILE=OFF
134 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
135 - -DCOMPILER_RT_BUILD_XRAY=OFF
136 -
137 - -DPython3_EXECUTABLE="${PYTHON}"
138 - )
139 -
140 - if use amd64; then
141 - mycmakeargs+=(
142 - -DCAN_TARGET_i386=$(usex abi_x86_32)
143 - -DCAN_TARGET_x86_64=$(usex abi_x86_64)
144 - )
145 - fi
146 -
147 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
148 - mycmakeargs+=(
149 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
150 - # this allows adding arm64 support using SDK in EPREFIX
151 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
152 - # Set version based on the SDK in EPREFIX.
153 - # This disables i386 for SDK >= 10.15
154 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
155 - # Use our libtool instead of looking it up with xcrun
156 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
157 - )
158 - fi
159 -
160 - if use test; then
161 - mycmakeargs+=(
162 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
163 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
164 -
165 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
166 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
167 - )
168 - fi
169 -
170 - cmake_src_configure
171 -}
172 -
173 -src_test() {
174 - # respect TMPDIR!
175 - local -x LIT_PRESERVES_TMP=1
176 -
177 - cmake_build check-builtins
178 -}
179
180 diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc2.ebuild
181 deleted file mode 100644
182 index 9b23dfc62570..000000000000
183 --- a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc2.ebuild
184 +++ /dev/null
185 @@ -1,137 +0,0 @@
186 -# Copyright 1999-2022 Gentoo Authors
187 -# Distributed under the terms of the GNU General Public License v2
188 -
189 -EAPI=7
190 -
191 -PYTHON_COMPAT=( python3_{8..10} )
192 -inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
193 -
194 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
195 -HOMEPAGE="https://llvm.org/"
196 -
197 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
198 -SLOT="$(ver_cut 1-3)"
199 -KEYWORDS=""
200 -IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
201 -RESTRICT="!test? ( test ) !clang? ( test )"
202 -
203 -CLANG_SLOT=${SLOT%%.*}
204 -# llvm-6 for new lit options
205 -DEPEND="
206 - >=sys-devel/llvm-6"
207 -BDEPEND="
208 - >=dev-util/cmake-3.16
209 - clang? ( sys-devel/clang )
210 - test? (
211 - $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
212 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
213 - )
214 - !test? (
215 - ${PYTHON_DEPS}
216 - )"
217 -
218 -LLVM_COMPONENTS=( compiler-rt )
219 -LLVM_PATCHSET=${PV/_/-}
220 -llvm.org_set_globals
221 -
222 -python_check_deps() {
223 - use test || return 0
224 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
225 -}
226 -
227 -pkg_pretend() {
228 - if ! use clang && ! tc-is-clang; then
229 - ewarn "Building using a compiler other than clang may result in broken atomics"
230 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
231 - fi
232 -}
233 -
234 -pkg_setup() {
235 - # Darwin Prefix builds do not have llvm installed yet, so rely on
236 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
237 - # of using llvm_pkg_setup.
238 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
239 - llvm_pkg_setup
240 - fi
241 - python-any-r1_pkg_setup
242 -}
243 -
244 -test_compiler() {
245 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
246 - <<<'int main() { return 0; }' &>/dev/null
247 -}
248 -
249 -src_configure() {
250 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
251 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
252 -
253 - # pre-set since we need to pass it to cmake
254 - BUILD_DIR=${WORKDIR}/${P}_build
255 -
256 - local nolib_flags=( -nodefaultlibs -lc )
257 - if use clang; then
258 - local -x CC=${CHOST}-clang
259 - local -x CXX=${CHOST}-clang++
260 - strip-unsupported-flags
261 - # ensure we can use clang before installing compiler-rt
262 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
263 - elif ! test_compiler; then
264 - if test_compiler "${nolib_flags[@]}"; then
265 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
266 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
267 - fi
268 - fi
269 -
270 - local mycmakeargs=(
271 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
272 -
273 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
274 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
275 - -DCOMPILER_RT_BUILD_MEMPROF=OFF
276 - -DCOMPILER_RT_BUILD_ORC=OFF
277 - -DCOMPILER_RT_BUILD_PROFILE=OFF
278 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
279 - -DCOMPILER_RT_BUILD_XRAY=OFF
280 -
281 - -DPython3_EXECUTABLE="${PYTHON}"
282 - )
283 -
284 - if use amd64; then
285 - mycmakeargs+=(
286 - -DCAN_TARGET_i386=$(usex abi_x86_32)
287 - -DCAN_TARGET_x86_64=$(usex abi_x86_64)
288 - )
289 - fi
290 -
291 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
292 - mycmakeargs+=(
293 - # setting -isysroot is disabled with compiler-rt-prefix-paths.patch
294 - # this allows adding arm64 support using SDK in EPREFIX
295 - -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
296 - # Set version based on the SDK in EPREFIX.
297 - # This disables i386 for SDK >= 10.15
298 - -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
299 - # Use our libtool instead of looking it up with xcrun
300 - -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
301 - )
302 - fi
303 -
304 - if use test; then
305 - mycmakeargs+=(
306 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
307 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
308 -
309 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
310 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
311 - )
312 - fi
313 -
314 - cmake_src_configure
315 -}
316 -
317 -src_test() {
318 - # respect TMPDIR!
319 - local -x LIT_PRESERVES_TMP=1
320 -
321 - cmake_build check-builtins
322 -}