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, 21 Jan 2022 15:38:32
Message-Id: 1642779453.a871732287e16ed3d83bdacc06b23925702ab8f2.mgorny@gentoo
1 commit: a871732287e16ed3d83bdacc06b23925702ab8f2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 21 12:15:38 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 21 15:37:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8717322
7
8 sys-libs/libcxxabi: Remove 13.0.1-rc{1,2}
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 2 -
13 sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild | 125 -------------------------
14 sys-libs/libcxxabi/libcxxabi-13.0.1_rc2.ebuild | 125 -------------------------
15 3 files changed, 252 deletions(-)
16
17 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
18 index c7196ba54f0a..dd7644d62981 100644
19 --- a/sys-libs/libcxxabi/Manifest
20 +++ b/sys-libs/libcxxabi/Manifest
21 @@ -1,6 +1,4 @@
22 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
23 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
24 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
25 -DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
26 -DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
27 DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
28
29 diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild
30 deleted file mode 100644
31 index d260ea2e3450..000000000000
32 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc1.ebuild
33 +++ /dev/null
34 @@ -1,125 +0,0 @@
35 -# Copyright 1999-2022 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -CMAKE_ECLASS=cmake
41 -PYTHON_COMPAT=( python3_{8..10} )
42 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
43 -
44 -DESCRIPTION="Low level support for a standard C++ library"
45 -HOMEPAGE="https://libcxxabi.llvm.org/"
46 -
47 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
48 -SLOT="0"
49 -KEYWORDS=""
50 -IUSE="+libunwind static-libs test"
51 -RESTRICT="!test? ( test )"
52 -
53 -RDEPEND="
54 - libunwind? (
55 - || (
56 - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
57 - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
58 - )
59 - )"
60 -# llvm-6 for new lit options
61 -DEPEND="${RDEPEND}
62 - >=sys-devel/llvm-6"
63 -BDEPEND="
64 - test? ( >=sys-devel/clang-3.9.0
65 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
66 - )"
67 -
68 -LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake )
69 -llvm.org_set_globals
70 -
71 -python_check_deps() {
72 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
73 -}
74 -
75 -pkg_setup() {
76 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
77 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
78 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
79 - llvm_pkg_setup
80 - fi
81 - use test && python-any-r1_pkg_setup
82 -}
83 -
84 -multilib_src_configure() {
85 - # we need a configured libc++ for __config_site
86 - wrap_libcxx cmake_src_configure
87 - wrap_libcxx cmake_build generate-cxx-headers
88 -
89 - # link against compiler-rt instead of libgcc if we are using clang with libunwind
90 - local want_compiler_rt=OFF
91 - if use libunwind && tc-is-clang; then
92 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
93 - ${LDFLAGS} -print-libgcc-file-name)
94 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
95 - want_compiler_rt=ON
96 - fi
97 - fi
98 -
99 - local libdir=$(get_libdir)
100 - local mycmakeargs=(
101 - -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
102 - -DLIBCXXABI_ENABLE_SHARED=ON
103 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
104 - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
105 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
106 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
107 -
108 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
109 - # upstream is omitting standard search path for this
110 - # probably because gcc & clang are bundling their own unwind.h
111 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
112 - -DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
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 -wrap_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 - -DLIBCXX_TARGET_TRIPLE="${CHOST}"
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.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.1_rc2.ebuild
162 deleted file mode 100644
163 index d260ea2e3450..000000000000
164 --- a/sys-libs/libcxxabi/libcxxabi-13.0.1_rc2.ebuild
165 +++ /dev/null
166 @@ -1,125 +0,0 @@
167 -# Copyright 1999-2022 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"
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 - -DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
245 - )
246 - if use test; then
247 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
248 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
249 -
250 - mycmakeargs+=(
251 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
252 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
253 - -DPython3_EXECUTABLE="${PYTHON}"
254 - )
255 - fi
256 - cmake_src_configure
257 -}
258 -
259 -wrap_libcxx() {
260 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
261 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
262 - local BUILD_DIR=${BUILD_DIR}/libcxx
263 - local mycmakeargs=(
264 - -DLIBCXX_LIBDIR_SUFFIX=
265 - -DLIBCXX_ENABLE_SHARED=OFF
266 - -DLIBCXX_ENABLE_STATIC=ON
267 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
268 - -DLIBCXX_CXX_ABI=libcxxabi
269 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
270 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
271 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
272 - -DLIBCXX_HAS_GCC_S_LIB=OFF
273 - -DLIBCXX_INCLUDE_TESTS=OFF
274 - -DLIBCXX_TARGET_TRIPLE="${CHOST}"
275 - )
276 -
277 - "${@}"
278 -}
279 -
280 -multilib_src_test() {
281 - wrap_libcxx cmake_src_compile
282 - mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
283 -
284 - local -x LIT_PRESERVES_TMP=1
285 - cmake_build check-cxxabi
286 -}
287 -
288 -multilib_src_install_all() {
289 - insinto /usr/include/libcxxabi
290 - doins -r include/.
291 -}