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: Thu, 15 Apr 2021 20:44:51
Message-Id: 1618519463.5ca043df9ace9268e2eafbdf6dab2e568f3bd6b1.mgorny@gentoo
1 commit: 5ca043df9ace9268e2eafbdf6dab2e568f3bd6b1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 15 20:37:46 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 20:44:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca043df
7
8 sys-libs/libcxxabi: Remove 12.0.0 RCs
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 4 -
13 sys-libs/libcxxabi/libcxxabi-12.0.0_rc2.ebuild | 122 -------------------------
14 sys-libs/libcxxabi/libcxxabi-12.0.0_rc3.ebuild | 122 -------------------------
15 sys-libs/libcxxabi/libcxxabi-12.0.0_rc4.ebuild | 122 -------------------------
16 sys-libs/libcxxabi/libcxxabi-12.0.0_rc5.ebuild | 122 -------------------------
17 5 files changed, 492 deletions(-)
18
19 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
20 index 087d75cb29b..09cfebc2769 100644
21 --- a/sys-libs/libcxxabi/Manifest
22 +++ b/sys-libs/libcxxabi/Manifest
23 @@ -2,8 +2,4 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
24 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
25 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
26 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
27 -DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
28 -DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
29 -DIST llvmorg-12.0.0-rc4.tar.gz 134245842 BLAKE2B 860a0551a42e2c6a28f213c151076c5ae64a9d85f7bfb2e2df4737acd5fe968f29d368a689d9a857e01038587e872722d216f044b3f665857d7ed71122fe334e SHA512 20e4440664227c9ea7af84df3643599cd7c96f5e2b6404c42be0ce0f0d7f989f5c7b8df1f1ba93d1473d3a30325cda5a53d3900c0229ccb042b365583b5aa846
30 -DIST llvmorg-12.0.0-rc5.tar.gz 134247991 BLAKE2B 9721e211d39611f9c48b57386fb57c1dcf964c39ff5f32c593a6390c06659fcd5a1f76063004d2ecd3d1af32281a69994c7478b7fdfacd9f50ebf5fbb2050a71 SHA512 a289fdc55c25454e8cbfd370387fdd11c7555d03b3c479213e37dd01189c077d67bd04b8cab62ce82f3746877f5f02619afb3a5110191048511efee38c191d16
31 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
32
33 diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0_rc2.ebuild
34 deleted file mode 100644
35 index 8c24d969111..00000000000
36 --- a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc2.ebuild
37 +++ /dev/null
38 @@ -1,122 +0,0 @@
39 -# Copyright 1999-2021 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -
44 -CMAKE_ECLASS=cmake
45 -PYTHON_COMPAT=( python3_{7..9} )
46 -inherit cmake-multilib llvm llvm.org python-any-r1 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=""
54 -IUSE="+libunwind static-libs test elibc_musl"
55 -RESTRICT="!test? ( test )"
56 -
57 -RDEPEND="
58 - libunwind? (
59 - || (
60 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
61 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
62 - )
63 - )"
64 -# llvm-6 for new lit options
65 -DEPEND="${RDEPEND}
66 - >=sys-devel/llvm-6"
67 -BDEPEND="
68 - test? ( >=sys-devel/clang-3.9.0
69 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
70 - )"
71 -
72 -# libcxx is needed uncondtionally for the headers
73 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
74 -llvm.org_set_globals
75 -
76 -python_check_deps() {
77 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
78 -}
79 -
80 -pkg_setup() {
81 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
82 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
83 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
84 - llvm_pkg_setup
85 - fi
86 - use test && python-any-r1_pkg_setup
87 -}
88 -
89 -multilib_src_configure() {
90 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
91 - local want_compiler_rt=OFF
92 - if use libunwind && tc-is-clang; then
93 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
94 - ${LDFLAGS} -print-libgcc-file-name)
95 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
96 - want_compiler_rt=ON
97 - fi
98 - fi
99 -
100 - local libdir=$(get_libdir)
101 - local mycmakeargs=(
102 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
103 - -DLIBCXXABI_ENABLE_SHARED=ON
104 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
105 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
106 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
107 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
108 -
109 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
110 - # upstream is omitting standard search path for this
111 - # probably because gcc & clang are bundling their own unwind.h
112 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
113 - )
114 - if use test; then
115 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
116 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
117 -
118 - mycmakeargs+=(
119 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
120 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
121 - -DPython3_EXECUTABLE="${PYTHON}"
122 - )
123 - fi
124 - cmake_src_configure
125 -}
126 -
127 -build_libcxx() {
128 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
129 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
130 - local BUILD_DIR=${BUILD_DIR}/libcxx
131 - local mycmakeargs=(
132 - -DLIBCXX_LIBDIR_SUFFIX=
133 - -DLIBCXX_ENABLE_SHARED=OFF
134 - -DLIBCXX_ENABLE_STATIC=ON
135 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
136 - -DLIBCXX_CXX_ABI=libcxxabi
137 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
138 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
139 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
140 - -DLIBCXX_HAS_GCC_S_LIB=OFF
141 - -DLIBCXX_INCLUDE_TESTS=OFF
142 - )
143 -
144 - cmake_src_configure
145 - cmake_src_compile
146 -}
147 -
148 -multilib_src_test() {
149 - # build a local copy of libc++ for testing to avoid circular dep
150 - build_libcxx
151 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
152 -
153 - local -x LIT_PRESERVES_TMP=1
154 - cmake_build check-cxxabi
155 -}
156 -
157 -multilib_src_install_all() {
158 - insinto /usr/include/libcxxabi
159 - doins -r include/.
160 -}
161
162 diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0_rc3.ebuild
163 deleted file mode 100644
164 index 8c24d969111..00000000000
165 --- a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc3.ebuild
166 +++ /dev/null
167 @@ -1,122 +0,0 @@
168 -# Copyright 1999-2021 Gentoo Authors
169 -# Distributed under the terms of the GNU General Public License v2
170 -
171 -EAPI=7
172 -
173 -CMAKE_ECLASS=cmake
174 -PYTHON_COMPAT=( python3_{7..9} )
175 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
176 -
177 -DESCRIPTION="Low level support for a standard C++ library"
178 -HOMEPAGE="https://libcxxabi.llvm.org/"
179 -
180 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
181 -SLOT="0"
182 -KEYWORDS=""
183 -IUSE="+libunwind static-libs test elibc_musl"
184 -RESTRICT="!test? ( test )"
185 -
186 -RDEPEND="
187 - libunwind? (
188 - || (
189 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
190 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
191 - )
192 - )"
193 -# llvm-6 for new lit options
194 -DEPEND="${RDEPEND}
195 - >=sys-devel/llvm-6"
196 -BDEPEND="
197 - test? ( >=sys-devel/clang-3.9.0
198 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
199 - )"
200 -
201 -# libcxx is needed uncondtionally for the headers
202 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
203 -llvm.org_set_globals
204 -
205 -python_check_deps() {
206 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
207 -}
208 -
209 -pkg_setup() {
210 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
211 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
212 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
213 - llvm_pkg_setup
214 - fi
215 - use test && python-any-r1_pkg_setup
216 -}
217 -
218 -multilib_src_configure() {
219 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
220 - local want_compiler_rt=OFF
221 - if use libunwind && tc-is-clang; then
222 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
223 - ${LDFLAGS} -print-libgcc-file-name)
224 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
225 - want_compiler_rt=ON
226 - fi
227 - fi
228 -
229 - local libdir=$(get_libdir)
230 - local mycmakeargs=(
231 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
232 - -DLIBCXXABI_ENABLE_SHARED=ON
233 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
234 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
235 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
236 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
237 -
238 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
239 - # upstream is omitting standard search path for this
240 - # probably because gcc & clang are bundling their own unwind.h
241 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
242 - )
243 - if use test; then
244 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
245 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
246 -
247 - mycmakeargs+=(
248 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
249 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
250 - -DPython3_EXECUTABLE="${PYTHON}"
251 - )
252 - fi
253 - cmake_src_configure
254 -}
255 -
256 -build_libcxx() {
257 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
258 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
259 - local BUILD_DIR=${BUILD_DIR}/libcxx
260 - local mycmakeargs=(
261 - -DLIBCXX_LIBDIR_SUFFIX=
262 - -DLIBCXX_ENABLE_SHARED=OFF
263 - -DLIBCXX_ENABLE_STATIC=ON
264 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
265 - -DLIBCXX_CXX_ABI=libcxxabi
266 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
267 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
268 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
269 - -DLIBCXX_HAS_GCC_S_LIB=OFF
270 - -DLIBCXX_INCLUDE_TESTS=OFF
271 - )
272 -
273 - cmake_src_configure
274 - cmake_src_compile
275 -}
276 -
277 -multilib_src_test() {
278 - # build a local copy of libc++ for testing to avoid circular dep
279 - build_libcxx
280 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
281 -
282 - local -x LIT_PRESERVES_TMP=1
283 - cmake_build check-cxxabi
284 -}
285 -
286 -multilib_src_install_all() {
287 - insinto /usr/include/libcxxabi
288 - doins -r include/.
289 -}
290
291 diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc4.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0_rc4.ebuild
292 deleted file mode 100644
293 index 8c24d969111..00000000000
294 --- a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc4.ebuild
295 +++ /dev/null
296 @@ -1,122 +0,0 @@
297 -# Copyright 1999-2021 Gentoo Authors
298 -# Distributed under the terms of the GNU General Public License v2
299 -
300 -EAPI=7
301 -
302 -CMAKE_ECLASS=cmake
303 -PYTHON_COMPAT=( python3_{7..9} )
304 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
305 -
306 -DESCRIPTION="Low level support for a standard C++ library"
307 -HOMEPAGE="https://libcxxabi.llvm.org/"
308 -
309 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
310 -SLOT="0"
311 -KEYWORDS=""
312 -IUSE="+libunwind static-libs test elibc_musl"
313 -RESTRICT="!test? ( test )"
314 -
315 -RDEPEND="
316 - libunwind? (
317 - || (
318 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
319 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
320 - )
321 - )"
322 -# llvm-6 for new lit options
323 -DEPEND="${RDEPEND}
324 - >=sys-devel/llvm-6"
325 -BDEPEND="
326 - test? ( >=sys-devel/clang-3.9.0
327 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
328 - )"
329 -
330 -# libcxx is needed uncondtionally for the headers
331 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
332 -llvm.org_set_globals
333 -
334 -python_check_deps() {
335 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
336 -}
337 -
338 -pkg_setup() {
339 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
340 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
341 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
342 - llvm_pkg_setup
343 - fi
344 - use test && python-any-r1_pkg_setup
345 -}
346 -
347 -multilib_src_configure() {
348 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
349 - local want_compiler_rt=OFF
350 - if use libunwind && tc-is-clang; then
351 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
352 - ${LDFLAGS} -print-libgcc-file-name)
353 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
354 - want_compiler_rt=ON
355 - fi
356 - fi
357 -
358 - local libdir=$(get_libdir)
359 - local mycmakeargs=(
360 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
361 - -DLIBCXXABI_ENABLE_SHARED=ON
362 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
363 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
364 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
365 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
366 -
367 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
368 - # upstream is omitting standard search path for this
369 - # probably because gcc & clang are bundling their own unwind.h
370 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
371 - )
372 - if use test; then
373 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
374 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
375 -
376 - mycmakeargs+=(
377 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
378 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
379 - -DPython3_EXECUTABLE="${PYTHON}"
380 - )
381 - fi
382 - cmake_src_configure
383 -}
384 -
385 -build_libcxx() {
386 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
387 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
388 - local BUILD_DIR=${BUILD_DIR}/libcxx
389 - local mycmakeargs=(
390 - -DLIBCXX_LIBDIR_SUFFIX=
391 - -DLIBCXX_ENABLE_SHARED=OFF
392 - -DLIBCXX_ENABLE_STATIC=ON
393 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
394 - -DLIBCXX_CXX_ABI=libcxxabi
395 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
396 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
397 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
398 - -DLIBCXX_HAS_GCC_S_LIB=OFF
399 - -DLIBCXX_INCLUDE_TESTS=OFF
400 - )
401 -
402 - cmake_src_configure
403 - cmake_src_compile
404 -}
405 -
406 -multilib_src_test() {
407 - # build a local copy of libc++ for testing to avoid circular dep
408 - build_libcxx
409 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
410 -
411 - local -x LIT_PRESERVES_TMP=1
412 - cmake_build check-cxxabi
413 -}
414 -
415 -multilib_src_install_all() {
416 - insinto /usr/include/libcxxabi
417 - doins -r include/.
418 -}
419
420 diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc5.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0_rc5.ebuild
421 deleted file mode 100644
422 index 8c24d969111..00000000000
423 --- a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc5.ebuild
424 +++ /dev/null
425 @@ -1,122 +0,0 @@
426 -# Copyright 1999-2021 Gentoo Authors
427 -# Distributed under the terms of the GNU General Public License v2
428 -
429 -EAPI=7
430 -
431 -CMAKE_ECLASS=cmake
432 -PYTHON_COMPAT=( python3_{7..9} )
433 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
434 -
435 -DESCRIPTION="Low level support for a standard C++ library"
436 -HOMEPAGE="https://libcxxabi.llvm.org/"
437 -
438 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
439 -SLOT="0"
440 -KEYWORDS=""
441 -IUSE="+libunwind static-libs test elibc_musl"
442 -RESTRICT="!test? ( test )"
443 -
444 -RDEPEND="
445 - libunwind? (
446 - || (
447 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
448 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
449 - )
450 - )"
451 -# llvm-6 for new lit options
452 -DEPEND="${RDEPEND}
453 - >=sys-devel/llvm-6"
454 -BDEPEND="
455 - test? ( >=sys-devel/clang-3.9.0
456 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
457 - )"
458 -
459 -# libcxx is needed uncondtionally for the headers
460 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules )
461 -llvm.org_set_globals
462 -
463 -python_check_deps() {
464 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
465 -}
466 -
467 -pkg_setup() {
468 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
469 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
470 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
471 - llvm_pkg_setup
472 - fi
473 - use test && python-any-r1_pkg_setup
474 -}
475 -
476 -multilib_src_configure() {
477 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
478 - local want_compiler_rt=OFF
479 - if use libunwind && tc-is-clang; then
480 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
481 - ${LDFLAGS} -print-libgcc-file-name)
482 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
483 - want_compiler_rt=ON
484 - fi
485 - fi
486 -
487 - local libdir=$(get_libdir)
488 - local mycmakeargs=(
489 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
490 - -DLIBCXXABI_ENABLE_SHARED=ON
491 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
492 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
493 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
494 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
495 -
496 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
497 - # upstream is omitting standard search path for this
498 - # probably because gcc & clang are bundling their own unwind.h
499 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
500 - )
501 - if use test; then
502 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
503 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
504 -
505 - mycmakeargs+=(
506 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
507 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
508 - -DPython3_EXECUTABLE="${PYTHON}"
509 - )
510 - fi
511 - cmake_src_configure
512 -}
513 -
514 -build_libcxx() {
515 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
516 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
517 - local BUILD_DIR=${BUILD_DIR}/libcxx
518 - local mycmakeargs=(
519 - -DLIBCXX_LIBDIR_SUFFIX=
520 - -DLIBCXX_ENABLE_SHARED=OFF
521 - -DLIBCXX_ENABLE_STATIC=ON
522 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
523 - -DLIBCXX_CXX_ABI=libcxxabi
524 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
525 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
526 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
527 - -DLIBCXX_HAS_GCC_S_LIB=OFF
528 - -DLIBCXX_INCLUDE_TESTS=OFF
529 - )
530 -
531 - cmake_src_configure
532 - cmake_src_compile
533 -}
534 -
535 -multilib_src_test() {
536 - # build a local copy of libc++ for testing to avoid circular dep
537 - build_libcxx
538 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
539 -
540 - local -x LIT_PRESERVES_TMP=1
541 - cmake_build check-cxxabi
542 -}
543 -
544 -multilib_src_install_all() {
545 - insinto /usr/include/libcxxabi
546 - doins -r include/.
547 -}