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: Fri, 01 Oct 2021 13:27:24
Message-Id: 1633094823.052c492f88849b6d350affd16b413ab7a1713caf.mgorny@gentoo
1 commit: 052c492f88849b6d350affd16b413ab7a1713caf
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 1 12:37:18 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 1 13:27:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=052c492f
7
8 sys-libs/libcxxabi: Remove 13.0.0 RCs
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 3 -
13 sys-libs/libcxxabi/libcxxabi-13.0.0_rc2.ebuild | 123 -------------------------
14 sys-libs/libcxxabi/libcxxabi-13.0.0_rc3.ebuild | 123 -------------------------
15 sys-libs/libcxxabi/libcxxabi-13.0.0_rc4.ebuild | 123 -------------------------
16 4 files changed, 372 deletions(-)
17
18 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
19 index 743ab9d8e74..10303759a73 100644
20 --- a/sys-libs/libcxxabi/Manifest
21 +++ b/sys-libs/libcxxabi/Manifest
22 @@ -1,7 +1,4 @@
23 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
24 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
25 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
26 -DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
27 -DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
28 -DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
29 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
30
31 diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc2.ebuild
32 deleted file mode 100644
33 index d11be625eea..00000000000
34 --- a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc2.ebuild
35 +++ /dev/null
36 @@ -1,123 +0,0 @@
37 -# Copyright 1999-2021 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=7
41 -
42 -CMAKE_ECLASS=cmake
43 -PYTHON_COMPAT=( python3_{8..10} )
44 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
45 -
46 -DESCRIPTION="Low level support for a standard C++ library"
47 -HOMEPAGE="https://libcxxabi.llvm.org/"
48 -
49 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
50 -SLOT="0"
51 -KEYWORDS=""
52 -IUSE="+libunwind static-libs test elibc_musl"
53 -RESTRICT="!test? ( test )"
54 -
55 -RDEPEND="
56 - libunwind? (
57 - || (
58 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
59 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
60 - )
61 - )"
62 -# llvm-6 for new lit options
63 -DEPEND="${RDEPEND}
64 - >=sys-devel/llvm-6"
65 -BDEPEND="
66 - test? ( >=sys-devel/clang-3.9.0
67 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
68 - )"
69 -
70 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
71 -llvm.org_set_globals
72 -
73 -python_check_deps() {
74 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
75 -}
76 -
77 -pkg_setup() {
78 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
79 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
80 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
81 - llvm_pkg_setup
82 - fi
83 - use test && python-any-r1_pkg_setup
84 -}
85 -
86 -multilib_src_configure() {
87 - # we need a configured libc++ for __config_site
88 - wrap_libcxx cmake_src_configure
89 - wrap_libcxx cmake_build generate-cxx-headers
90 -
91 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
92 - local want_compiler_rt=OFF
93 - if use libunwind && tc-is-clang; then
94 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
95 - ${LDFLAGS} -print-libgcc-file-name)
96 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
97 - want_compiler_rt=ON
98 - fi
99 - fi
100 -
101 - local libdir=$(get_libdir)
102 - local mycmakeargs=(
103 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
104 - -DLIBCXXABI_ENABLE_SHARED=ON
105 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
106 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
107 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
108 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
109 -
110 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
111 - # upstream is omitting standard search path for this
112 - # probably because gcc & clang are bundling their own unwind.h
113 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
114 - )
115 - if use test; then
116 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
117 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
118 -
119 - mycmakeargs+=(
120 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
121 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
122 - -DPython3_EXECUTABLE="${PYTHON}"
123 - )
124 - fi
125 - cmake_src_configure
126 -}
127 -
128 -wrap_libcxx() {
129 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
130 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
131 - local BUILD_DIR=${BUILD_DIR}/libcxx
132 - local mycmakeargs=(
133 - -DLIBCXX_LIBDIR_SUFFIX=
134 - -DLIBCXX_ENABLE_SHARED=OFF
135 - -DLIBCXX_ENABLE_STATIC=ON
136 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
137 - -DLIBCXX_CXX_ABI=libcxxabi
138 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
139 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
140 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
141 - -DLIBCXX_HAS_GCC_S_LIB=OFF
142 - -DLIBCXX_INCLUDE_TESTS=OFF
143 - )
144 -
145 - "${@}"
146 -}
147 -
148 -multilib_src_test() {
149 - wrap_libcxx cmake_src_compile
150 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
151 -
152 - local -x LIT_PRESERVES_TMP=1
153 - cmake_build check-cxxabi
154 -}
155 -
156 -multilib_src_install_all() {
157 - insinto /usr/include/libcxxabi
158 - doins -r include/.
159 -}
160
161 diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc3.ebuild
162 deleted file mode 100644
163 index d11be625eea..00000000000
164 --- a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc3.ebuild
165 +++ /dev/null
166 @@ -1,123 +0,0 @@
167 -# Copyright 1999-2021 Gentoo Authors
168 -# Distributed under the terms of the GNU General Public License v2
169 -
170 -EAPI=7
171 -
172 -CMAKE_ECLASS=cmake
173 -PYTHON_COMPAT=( python3_{8..10} )
174 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
175 -
176 -DESCRIPTION="Low level support for a standard C++ library"
177 -HOMEPAGE="https://libcxxabi.llvm.org/"
178 -
179 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
180 -SLOT="0"
181 -KEYWORDS=""
182 -IUSE="+libunwind static-libs test elibc_musl"
183 -RESTRICT="!test? ( test )"
184 -
185 -RDEPEND="
186 - libunwind? (
187 - || (
188 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
189 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
190 - )
191 - )"
192 -# llvm-6 for new lit options
193 -DEPEND="${RDEPEND}
194 - >=sys-devel/llvm-6"
195 -BDEPEND="
196 - test? ( >=sys-devel/clang-3.9.0
197 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
198 - )"
199 -
200 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
201 -llvm.org_set_globals
202 -
203 -python_check_deps() {
204 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
205 -}
206 -
207 -pkg_setup() {
208 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
209 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
210 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
211 - llvm_pkg_setup
212 - fi
213 - use test && python-any-r1_pkg_setup
214 -}
215 -
216 -multilib_src_configure() {
217 - # we need a configured libc++ for __config_site
218 - wrap_libcxx cmake_src_configure
219 - wrap_libcxx cmake_build generate-cxx-headers
220 -
221 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
222 - local want_compiler_rt=OFF
223 - if use libunwind && tc-is-clang; then
224 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
225 - ${LDFLAGS} -print-libgcc-file-name)
226 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
227 - want_compiler_rt=ON
228 - fi
229 - fi
230 -
231 - local libdir=$(get_libdir)
232 - local mycmakeargs=(
233 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
234 - -DLIBCXXABI_ENABLE_SHARED=ON
235 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
236 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
237 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
238 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
239 -
240 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
241 - # upstream is omitting standard search path for this
242 - # probably because gcc & clang are bundling their own unwind.h
243 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
244 - )
245 - if use test; then
246 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
247 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
248 -
249 - mycmakeargs+=(
250 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
251 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
252 - -DPython3_EXECUTABLE="${PYTHON}"
253 - )
254 - fi
255 - cmake_src_configure
256 -}
257 -
258 -wrap_libcxx() {
259 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
260 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
261 - local BUILD_DIR=${BUILD_DIR}/libcxx
262 - local mycmakeargs=(
263 - -DLIBCXX_LIBDIR_SUFFIX=
264 - -DLIBCXX_ENABLE_SHARED=OFF
265 - -DLIBCXX_ENABLE_STATIC=ON
266 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
267 - -DLIBCXX_CXX_ABI=libcxxabi
268 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
269 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
270 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
271 - -DLIBCXX_HAS_GCC_S_LIB=OFF
272 - -DLIBCXX_INCLUDE_TESTS=OFF
273 - )
274 -
275 - "${@}"
276 -}
277 -
278 -multilib_src_test() {
279 - wrap_libcxx cmake_src_compile
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-13.0.0_rc4.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0_rc4.ebuild
292 deleted file mode 100644
293 index d11be625eea..00000000000
294 --- a/sys-libs/libcxxabi/libcxxabi-13.0.0_rc4.ebuild
295 +++ /dev/null
296 @@ -1,123 +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_{8..10} )
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 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
331 -llvm.org_set_globals
332 -
333 -python_check_deps() {
334 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
335 -}
336 -
337 -pkg_setup() {
338 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
339 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
340 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
341 - llvm_pkg_setup
342 - fi
343 - use test && python-any-r1_pkg_setup
344 -}
345 -
346 -multilib_src_configure() {
347 - # we need a configured libc++ for __config_site
348 - wrap_libcxx cmake_src_configure
349 - wrap_libcxx cmake_build generate-cxx-headers
350 -
351 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
352 - local want_compiler_rt=OFF
353 - if use libunwind && tc-is-clang; then
354 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
355 - ${LDFLAGS} -print-libgcc-file-name)
356 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
357 - want_compiler_rt=ON
358 - fi
359 - fi
360 -
361 - local libdir=$(get_libdir)
362 - local mycmakeargs=(
363 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
364 - -DLIBCXXABI_ENABLE_SHARED=ON
365 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
366 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
367 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
368 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
369 -
370 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
371 - # upstream is omitting standard search path for this
372 - # probably because gcc & clang are bundling their own unwind.h
373 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
374 - )
375 - if use test; then
376 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
377 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
378 -
379 - mycmakeargs+=(
380 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
381 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
382 - -DPython3_EXECUTABLE="${PYTHON}"
383 - )
384 - fi
385 - cmake_src_configure
386 -}
387 -
388 -wrap_libcxx() {
389 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
390 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
391 - local BUILD_DIR=${BUILD_DIR}/libcxx
392 - local mycmakeargs=(
393 - -DLIBCXX_LIBDIR_SUFFIX=
394 - -DLIBCXX_ENABLE_SHARED=OFF
395 - -DLIBCXX_ENABLE_STATIC=ON
396 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
397 - -DLIBCXX_CXX_ABI=libcxxabi
398 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
399 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
400 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
401 - -DLIBCXX_HAS_GCC_S_LIB=OFF
402 - -DLIBCXX_INCLUDE_TESTS=OFF
403 - )
404 -
405 - "${@}"
406 -}
407 -
408 -multilib_src_test() {
409 - wrap_libcxx cmake_src_compile
410 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
411 -
412 - local -x LIT_PRESERVES_TMP=1
413 - cmake_build check-cxxabi
414 -}
415 -
416 -multilib_src_install_all() {
417 - insinto /usr/include/libcxxabi
418 - doins -r include/.
419 -}