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