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/libcxxabi/
Date: Tue, 28 Feb 2023 13:10:21
Message-Id: 1677589685.1584516b03a00f0dd2187b1b1039bb6da189da0c.mgorny@gentoo
1 commit: 1584516b03a00f0dd2187b1b1039bb6da189da0c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 28 13:08:05 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 28 13:08:05 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1584516b
7
8 sys-libs/libcxxabi: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 4 -
13 sys-libs/libcxxabi/libcxxabi-16.0.0_rc2.ebuild | 116 ---------------------
14 .../libcxxabi/libcxxabi-17.0.0_pre20230211.ebuild | 116 ---------------------
15 .../libcxxabi/libcxxabi-17.0.0_pre20230218.ebuild | 116 ---------------------
16 4 files changed, 352 deletions(-)
17
18 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
19 index b3ac1c92b538..f60583ac2e4c 100644
20 --- a/sys-libs/libcxxabi/Manifest
21 +++ b/sys-libs/libcxxabi/Manifest
22 @@ -2,10 +2,6 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
23 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
24 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
25 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
26 -DIST llvm-project-16.0.0rc2.src.tar.xz 117917640 BLAKE2B 92c6b1daaa500339403dcf530efb23e1d869c7b9cd8677a6680e57d5d087fb54182f009d58bdda714b62a5866d7fe3b10deedc1e251fffdaae513706d95325af SHA512 c68bb7f2a8004666ecc5c55e89e2ca1252b384e6240a2b7c5588b74794ffc6ce93bb4b0db394abba6436cce04a6de301e80821aeda04d7aab49efb96b6f8cf40
27 -DIST llvm-project-16.0.0rc2.src.tar.xz.sig 566 BLAKE2B 35b2a8edf3392e1c0e9bf7f1a5e6e18fdda3d98a2164947cebf0c19d7d7c7a459901060345745dff794cf99bea243fec5cb625ca68d7c73d31ac01f18cbaa58c SHA512 4f6d43f00c3bce36c3a005441473fe37fe2ca97df4b8dd306045bd0d8bd14406ae7068a3dea54d4535eaa37b7ccca54b3f5b6f5aef70a7dfc23ed336d4ad408c
28 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
29 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
30 -DIST llvm-project-22fb66eb94b643c858c2beecbcfac438a7fa29ed.tar.gz 179795537 BLAKE2B aef57ef739c52a8f8b2b327a8f6d8cce4734d9704018fb43a21468e56748e5d5b3d2d47fb4e95fd72b2af9f2e4be88839553e26fd7da08df60c5cc0f51c001d4 SHA512 9ed093ef7dac4891660aafbc5cad66bddefa796bff4dd70c792cc636268742142d82b84520ac2f5a5963521d7b9e4325440763ce0c88937f89722f07d3acd4b8
31 -DIST llvm-project-5e262d58c42668c78d932fab6bf75cf8c3b9d07e.tar.gz 179975303 BLAKE2B 184e7ff6e9a7de77d4a8c36c6910e4e3c7c5e9ff73ed6111ec4704dd457205278abb258ff37170e41a6b21c9ae3f243a80b34e4b17f8977fb9a42876db6465b7 SHA512 ec7e16a4d8f8292d1184ae08c1c5eda0dba1876e7d9c228eb0added5cde45f3094fde7eb1da662d436f85315850310cc0612210ff3ddf82967d5c2de0047a724
32 DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
33
34 diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0_rc2.ebuild
35 deleted file mode 100644
36 index fb725b1c09a1..000000000000
37 --- a/sys-libs/libcxxabi/libcxxabi-16.0.0_rc2.ebuild
38 +++ /dev/null
39 @@ -1,116 +0,0 @@
40 -# Copyright 1999-2023 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=8
44 -
45 -PYTHON_COMPAT=( python3_{9..11} )
46 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
47 - toolchain-funcs
48 -
49 -DESCRIPTION="Low level support for a standard C++ library"
50 -HOMEPAGE="https://libcxxabi.llvm.org/"
51 -
52 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
53 -SLOT="0"
54 -KEYWORDS="~loong"
55 -IUSE="+clang static-libs test"
56 -REQUIRED_USE="test? ( clang )"
57 -RESTRICT="!test? ( test )"
58 -
59 -# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
60 -RDEPEND+="
61 - !<sys-libs/libcxx-15
62 -"
63 -DEPEND="
64 - ${RDEPEND}
65 - sys-devel/llvm:${LLVM_MAJOR}
66 -"
67 -BDEPEND="
68 - clang? (
69 - sys-devel/clang:${LLVM_MAJOR}
70 - )
71 - !test? (
72 - ${PYTHON_DEPS}
73 - )
74 - test? (
75 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
76 - )
77 -"
78 -
79 -LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
80 -LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
81 -llvm.org_set_globals
82 -
83 -python_check_deps() {
84 - use test || return 0
85 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
86 -}
87 -
88 -pkg_setup() {
89 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
90 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
91 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
92 - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
93 - fi
94 - python-any-r1_pkg_setup
95 -}
96 -
97 -multilib_src_configure() {
98 - if use clang; then
99 - local -x CC=${CHOST}-clang
100 - local -x CXX=${CHOST}-clang++
101 - strip-unsupported-flags
102 - fi
103 -
104 - # link to compiler-rt
105 - local use_compiler_rt=OFF
106 - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
107 -
108 - local libdir=$(get_libdir)
109 - local mycmakeargs=(
110 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
111 - -DPython3_EXECUTABLE="${PYTHON}"
112 - -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
113 - -DLLVM_INCLUDE_TESTS=OFF
114 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
115 - -DLIBCXXABI_ENABLE_SHARED=ON
116 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
117 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
118 - -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
119 -
120 - # upstream is omitting standard search path for this
121 - # probably because gcc & clang are bundling their own unwind.h
122 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
123 -
124 - -DLIBCXX_LIBDIR_SUFFIX=
125 - -DLIBCXX_ENABLE_SHARED=ON
126 - -DLIBCXX_ENABLE_STATIC=OFF
127 - -DLIBCXX_CXX_ABI=libcxxabi
128 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
129 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
130 - -DLIBCXX_HAS_GCC_S_LIB=OFF
131 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
132 - -DLIBCXX_INCLUDE_TESTS=OFF
133 - )
134 - if use test; then
135 - mycmakeargs+=(
136 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
137 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
138 - -DPython3_EXECUTABLE="${PYTHON}"
139 - )
140 - fi
141 - cmake_src_configure
142 -}
143 -
144 -multilib_src_compile() {
145 - cmake_build cxxabi
146 -}
147 -
148 -multilib_src_test() {
149 - local -x LIT_PRESERVES_TMP=1
150 - cmake_build check-cxxabi
151 -}
152 -
153 -multilib_src_install() {
154 - DESTDIR="${D}" cmake_build install-cxxabi
155 -}
156
157 diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230211.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230211.ebuild
158 deleted file mode 100644
159 index e5f19fc61a28..000000000000
160 --- a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230211.ebuild
161 +++ /dev/null
162 @@ -1,116 +0,0 @@
163 -# Copyright 1999-2023 Gentoo Authors
164 -# Distributed under the terms of the GNU General Public License v2
165 -
166 -EAPI=8
167 -
168 -PYTHON_COMPAT=( python3_{9..11} )
169 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
170 - toolchain-funcs
171 -
172 -DESCRIPTION="Low level support for a standard C++ library"
173 -HOMEPAGE="https://libcxxabi.llvm.org/"
174 -
175 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
176 -SLOT="0"
177 -KEYWORDS=""
178 -IUSE="+clang static-libs test"
179 -REQUIRED_USE="test? ( clang )"
180 -RESTRICT="!test? ( test )"
181 -
182 -# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
183 -RDEPEND+="
184 - !<sys-libs/libcxx-15
185 -"
186 -DEPEND="
187 - ${RDEPEND}
188 - sys-devel/llvm:${LLVM_MAJOR}
189 -"
190 -BDEPEND="
191 - clang? (
192 - sys-devel/clang:${LLVM_MAJOR}
193 - )
194 - !test? (
195 - ${PYTHON_DEPS}
196 - )
197 - test? (
198 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
199 - )
200 -"
201 -
202 -LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
203 -LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
204 -llvm.org_set_globals
205 -
206 -python_check_deps() {
207 - use test || return 0
208 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
209 -}
210 -
211 -pkg_setup() {
212 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
213 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
214 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
215 - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
216 - fi
217 - python-any-r1_pkg_setup
218 -}
219 -
220 -multilib_src_configure() {
221 - if use clang; then
222 - local -x CC=${CHOST}-clang
223 - local -x CXX=${CHOST}-clang++
224 - strip-unsupported-flags
225 - fi
226 -
227 - # link to compiler-rt
228 - local use_compiler_rt=OFF
229 - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
230 -
231 - local libdir=$(get_libdir)
232 - local mycmakeargs=(
233 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
234 - -DPython3_EXECUTABLE="${PYTHON}"
235 - -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
236 - -DLLVM_INCLUDE_TESTS=OFF
237 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
238 - -DLIBCXXABI_ENABLE_SHARED=ON
239 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
240 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
241 - -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
242 -
243 - # upstream is omitting standard search path for this
244 - # probably because gcc & clang are bundling their own unwind.h
245 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
246 -
247 - -DLIBCXX_LIBDIR_SUFFIX=
248 - -DLIBCXX_ENABLE_SHARED=ON
249 - -DLIBCXX_ENABLE_STATIC=OFF
250 - -DLIBCXX_CXX_ABI=libcxxabi
251 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
252 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
253 - -DLIBCXX_HAS_GCC_S_LIB=OFF
254 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
255 - -DLIBCXX_INCLUDE_TESTS=OFF
256 - )
257 - if use test; then
258 - mycmakeargs+=(
259 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
260 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
261 - -DPython3_EXECUTABLE="${PYTHON}"
262 - )
263 - fi
264 - cmake_src_configure
265 -}
266 -
267 -multilib_src_compile() {
268 - cmake_build cxxabi
269 -}
270 -
271 -multilib_src_test() {
272 - local -x LIT_PRESERVES_TMP=1
273 - cmake_build check-cxxabi
274 -}
275 -
276 -multilib_src_install() {
277 - DESTDIR="${D}" cmake_build install-cxxabi
278 -}
279
280 diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230218.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230218.ebuild
281 deleted file mode 100644
282 index e5f19fc61a28..000000000000
283 --- a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230218.ebuild
284 +++ /dev/null
285 @@ -1,116 +0,0 @@
286 -# Copyright 1999-2023 Gentoo Authors
287 -# Distributed under the terms of the GNU General Public License v2
288 -
289 -EAPI=8
290 -
291 -PYTHON_COMPAT=( python3_{9..11} )
292 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
293 - toolchain-funcs
294 -
295 -DESCRIPTION="Low level support for a standard C++ library"
296 -HOMEPAGE="https://libcxxabi.llvm.org/"
297 -
298 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
299 -SLOT="0"
300 -KEYWORDS=""
301 -IUSE="+clang static-libs test"
302 -REQUIRED_USE="test? ( clang )"
303 -RESTRICT="!test? ( test )"
304 -
305 -# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
306 -RDEPEND+="
307 - !<sys-libs/libcxx-15
308 -"
309 -DEPEND="
310 - ${RDEPEND}
311 - sys-devel/llvm:${LLVM_MAJOR}
312 -"
313 -BDEPEND="
314 - clang? (
315 - sys-devel/clang:${LLVM_MAJOR}
316 - )
317 - !test? (
318 - ${PYTHON_DEPS}
319 - )
320 - test? (
321 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
322 - )
323 -"
324 -
325 -LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
326 -LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
327 -llvm.org_set_globals
328 -
329 -python_check_deps() {
330 - use test || return 0
331 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
332 -}
333 -
334 -pkg_setup() {
335 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
336 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
337 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
338 - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
339 - fi
340 - python-any-r1_pkg_setup
341 -}
342 -
343 -multilib_src_configure() {
344 - if use clang; then
345 - local -x CC=${CHOST}-clang
346 - local -x CXX=${CHOST}-clang++
347 - strip-unsupported-flags
348 - fi
349 -
350 - # link to compiler-rt
351 - local use_compiler_rt=OFF
352 - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
353 -
354 - local libdir=$(get_libdir)
355 - local mycmakeargs=(
356 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
357 - -DPython3_EXECUTABLE="${PYTHON}"
358 - -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
359 - -DLLVM_INCLUDE_TESTS=OFF
360 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
361 - -DLIBCXXABI_ENABLE_SHARED=ON
362 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
363 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
364 - -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
365 -
366 - # upstream is omitting standard search path for this
367 - # probably because gcc & clang are bundling their own unwind.h
368 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
369 -
370 - -DLIBCXX_LIBDIR_SUFFIX=
371 - -DLIBCXX_ENABLE_SHARED=ON
372 - -DLIBCXX_ENABLE_STATIC=OFF
373 - -DLIBCXX_CXX_ABI=libcxxabi
374 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
375 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
376 - -DLIBCXX_HAS_GCC_S_LIB=OFF
377 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
378 - -DLIBCXX_INCLUDE_TESTS=OFF
379 - )
380 - if use test; then
381 - mycmakeargs+=(
382 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
383 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
384 - -DPython3_EXECUTABLE="${PYTHON}"
385 - )
386 - fi
387 - cmake_src_configure
388 -}
389 -
390 -multilib_src_compile() {
391 - cmake_build cxxabi
392 -}
393 -
394 -multilib_src_test() {
395 - local -x LIT_PRESERVES_TMP=1
396 - cmake_build check-cxxabi
397 -}
398 -
399 -multilib_src_install() {
400 - DESTDIR="${D}" cmake_build install-cxxabi
401 -}