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: Wed, 06 Jan 2021 21:23:59
Message-Id: 1609968202.574003255d95afce087117eb42adc884b00174ca.mgorny@gentoo
1 commit: 574003255d95afce087117eb42adc884b00174ca
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 6 17:18:54 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 6 21:23:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57400325
7
8 sys-libs/libcxxabi: Remove 11.0.1 RCs and live
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 2 -
13 sys-libs/libcxxabi/libcxxabi-11.0.1.9999.ebuild | 122 ------------------------
14 sys-libs/libcxxabi/libcxxabi-11.0.1_rc1.ebuild | 122 ------------------------
15 sys-libs/libcxxabi/libcxxabi-11.0.1_rc2.ebuild | 122 ------------------------
16 4 files changed, 368 deletions(-)
17
18 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
19 index 29b0efe3c21..47a7ff9f78f 100644
20 --- a/sys-libs/libcxxabi/Manifest
21 +++ b/sys-libs/libcxxabi/Manifest
22 @@ -1,6 +1,4 @@
23 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
24 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
25 -DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
26 -DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
27 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
28 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
29
30 diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.1.9999.ebuild
31 deleted file mode 100644
32 index 954ae031580..00000000000
33 --- a/sys-libs/libcxxabi/libcxxabi-11.0.1.9999.ebuild
34 +++ /dev/null
35 @@ -1,122 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -CMAKE_ECLASS=cmake
42 -PYTHON_COMPAT=( python3_{6..9} )
43 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
44 -
45 -DESCRIPTION="Low level support for a standard C++ library"
46 -HOMEPAGE="https://libcxxabi.llvm.org/"
47 -
48 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
49 -SLOT="0"
50 -KEYWORDS=""
51 -IUSE="+libunwind +static-libs test elibc_musl"
52 -RESTRICT="!test? ( test )"
53 -
54 -RDEPEND="
55 - libunwind? (
56 - || (
57 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
58 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
59 - )
60 - )"
61 -# llvm-6 for new lit options
62 -DEPEND="${RDEPEND}
63 - >=sys-devel/llvm-6"
64 -BDEPEND="
65 - test? ( >=sys-devel/clang-3.9.0
66 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
67 - )"
68 -
69 -# libcxx is needed uncondtionally for the headers
70 -LLVM_COMPONENTS=( libcxx{abi,} )
71 -LLVM_TEST_COMPONENTS=( llvm/cmake )
72 -llvm.org_set_globals
73 -
74 -python_check_deps() {
75 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
76 -}
77 -
78 -pkg_setup() {
79 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
80 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
81 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
82 - llvm_pkg_setup
83 - fi
84 - use test && python-any-r1_pkg_setup
85 -}
86 -
87 -multilib_src_configure() {
88 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
89 - local want_compiler_rt=OFF
90 - if use libunwind && tc-is-clang; then
91 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
92 - ${LDFLAGS} -print-libgcc-file-name)
93 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
94 - want_compiler_rt=ON
95 - fi
96 - fi
97 -
98 - local libdir=$(get_libdir)
99 - local mycmakeargs=(
100 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
101 - -DLIBCXXABI_ENABLE_SHARED=ON
102 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
103 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
104 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
105 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
106 -
107 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
108 - # upstream is omitting standard search path for this
109 - # probably because gcc & clang are bundling their own unwind.h
110 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
111 - )
112 - if use test; then
113 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
114 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
115 -
116 - mycmakeargs+=(
117 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
118 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
119 - )
120 - fi
121 - cmake_src_configure
122 -}
123 -
124 -build_libcxx() {
125 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
126 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
127 - local BUILD_DIR=${BUILD_DIR}/libcxx
128 - local mycmakeargs=(
129 - -DLIBCXX_LIBDIR_SUFFIX=
130 - -DLIBCXX_ENABLE_SHARED=OFF
131 - -DLIBCXX_ENABLE_STATIC=ON
132 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
133 - -DLIBCXX_CXX_ABI=libcxxabi
134 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
135 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
136 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
137 - -DLIBCXX_HAS_GCC_S_LIB=OFF
138 - -DLIBCXX_INCLUDE_TESTS=OFF
139 - )
140 -
141 - cmake_src_configure
142 - cmake_src_compile
143 -}
144 -
145 -multilib_src_test() {
146 - # build a local copy of libc++ for testing to avoid circular dep
147 - build_libcxx
148 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
149 -
150 - local -x LIT_PRESERVES_TMP=1
151 - cmake_build check-cxxabi
152 -}
153 -
154 -multilib_src_install_all() {
155 - insinto /usr/include/libcxxabi
156 - doins -r include/.
157 -}
158
159 diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.1_rc1.ebuild
160 deleted file mode 100644
161 index 954ae031580..00000000000
162 --- a/sys-libs/libcxxabi/libcxxabi-11.0.1_rc1.ebuild
163 +++ /dev/null
164 @@ -1,122 +0,0 @@
165 -# Copyright 1999-2020 Gentoo Authors
166 -# Distributed under the terms of the GNU General Public License v2
167 -
168 -EAPI=7
169 -
170 -CMAKE_ECLASS=cmake
171 -PYTHON_COMPAT=( python3_{6..9} )
172 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
173 -
174 -DESCRIPTION="Low level support for a standard C++ library"
175 -HOMEPAGE="https://libcxxabi.llvm.org/"
176 -
177 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
178 -SLOT="0"
179 -KEYWORDS=""
180 -IUSE="+libunwind +static-libs test elibc_musl"
181 -RESTRICT="!test? ( test )"
182 -
183 -RDEPEND="
184 - libunwind? (
185 - || (
186 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
187 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
188 - )
189 - )"
190 -# llvm-6 for new lit options
191 -DEPEND="${RDEPEND}
192 - >=sys-devel/llvm-6"
193 -BDEPEND="
194 - test? ( >=sys-devel/clang-3.9.0
195 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
196 - )"
197 -
198 -# libcxx is needed uncondtionally for the headers
199 -LLVM_COMPONENTS=( libcxx{abi,} )
200 -LLVM_TEST_COMPONENTS=( 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 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
218 - local want_compiler_rt=OFF
219 - if use libunwind && tc-is-clang; then
220 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
221 - ${LDFLAGS} -print-libgcc-file-name)
222 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
223 - want_compiler_rt=ON
224 - fi
225 - fi
226 -
227 - local libdir=$(get_libdir)
228 - local mycmakeargs=(
229 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
230 - -DLIBCXXABI_ENABLE_SHARED=ON
231 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
232 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
233 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
234 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
235 -
236 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
237 - # upstream is omitting standard search path for this
238 - # probably because gcc & clang are bundling their own unwind.h
239 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
240 - )
241 - if use test; then
242 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
243 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
244 -
245 - mycmakeargs+=(
246 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
247 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
248 - )
249 - fi
250 - cmake_src_configure
251 -}
252 -
253 -build_libcxx() {
254 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
255 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
256 - local BUILD_DIR=${BUILD_DIR}/libcxx
257 - local mycmakeargs=(
258 - -DLIBCXX_LIBDIR_SUFFIX=
259 - -DLIBCXX_ENABLE_SHARED=OFF
260 - -DLIBCXX_ENABLE_STATIC=ON
261 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
262 - -DLIBCXX_CXX_ABI=libcxxabi
263 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
264 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
265 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
266 - -DLIBCXX_HAS_GCC_S_LIB=OFF
267 - -DLIBCXX_INCLUDE_TESTS=OFF
268 - )
269 -
270 - cmake_src_configure
271 - cmake_src_compile
272 -}
273 -
274 -multilib_src_test() {
275 - # build a local copy of libc++ for testing to avoid circular dep
276 - build_libcxx
277 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
278 -
279 - local -x LIT_PRESERVES_TMP=1
280 - cmake_build check-cxxabi
281 -}
282 -
283 -multilib_src_install_all() {
284 - insinto /usr/include/libcxxabi
285 - doins -r include/.
286 -}
287
288 diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.1_rc2.ebuild
289 deleted file mode 100644
290 index 954ae031580..00000000000
291 --- a/sys-libs/libcxxabi/libcxxabi-11.0.1_rc2.ebuild
292 +++ /dev/null
293 @@ -1,122 +0,0 @@
294 -# Copyright 1999-2020 Gentoo Authors
295 -# Distributed under the terms of the GNU General Public License v2
296 -
297 -EAPI=7
298 -
299 -CMAKE_ECLASS=cmake
300 -PYTHON_COMPAT=( python3_{6..9} )
301 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
302 -
303 -DESCRIPTION="Low level support for a standard C++ library"
304 -HOMEPAGE="https://libcxxabi.llvm.org/"
305 -
306 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
307 -SLOT="0"
308 -KEYWORDS=""
309 -IUSE="+libunwind +static-libs test elibc_musl"
310 -RESTRICT="!test? ( test )"
311 -
312 -RDEPEND="
313 - libunwind? (
314 - || (
315 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
316 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
317 - )
318 - )"
319 -# llvm-6 for new lit options
320 -DEPEND="${RDEPEND}
321 - >=sys-devel/llvm-6"
322 -BDEPEND="
323 - test? ( >=sys-devel/clang-3.9.0
324 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
325 - )"
326 -
327 -# libcxx is needed uncondtionally for the headers
328 -LLVM_COMPONENTS=( libcxx{abi,} )
329 -LLVM_TEST_COMPONENTS=( llvm/cmake )
330 -llvm.org_set_globals
331 -
332 -python_check_deps() {
333 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
334 -}
335 -
336 -pkg_setup() {
337 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
338 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
339 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
340 - llvm_pkg_setup
341 - fi
342 - use test && python-any-r1_pkg_setup
343 -}
344 -
345 -multilib_src_configure() {
346 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
347 - local want_compiler_rt=OFF
348 - if use libunwind && tc-is-clang; then
349 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
350 - ${LDFLAGS} -print-libgcc-file-name)
351 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
352 - want_compiler_rt=ON
353 - fi
354 - fi
355 -
356 - local libdir=$(get_libdir)
357 - local mycmakeargs=(
358 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
359 - -DLIBCXXABI_ENABLE_SHARED=ON
360 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
361 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
362 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
363 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
364 -
365 - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
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 - if use test; then
371 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
372 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
373 -
374 - mycmakeargs+=(
375 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
376 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
377 - )
378 - fi
379 - cmake_src_configure
380 -}
381 -
382 -build_libcxx() {
383 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
384 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
385 - local BUILD_DIR=${BUILD_DIR}/libcxx
386 - local mycmakeargs=(
387 - -DLIBCXX_LIBDIR_SUFFIX=
388 - -DLIBCXX_ENABLE_SHARED=OFF
389 - -DLIBCXX_ENABLE_STATIC=ON
390 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
391 - -DLIBCXX_CXX_ABI=libcxxabi
392 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
393 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
394 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
395 - -DLIBCXX_HAS_GCC_S_LIB=OFF
396 - -DLIBCXX_INCLUDE_TESTS=OFF
397 - )
398 -
399 - cmake_src_configure
400 - cmake_src_compile
401 -}
402 -
403 -multilib_src_test() {
404 - # build a local copy of libc++ for testing to avoid circular dep
405 - build_libcxx
406 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
407 -
408 - local -x LIT_PRESERVES_TMP=1
409 - cmake_build check-cxxabi
410 -}
411 -
412 -multilib_src_install_all() {
413 - insinto /usr/include/libcxxabi
414 - doins -r include/.
415 -}