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/llvm-libunwind/
Date: Fri, 21 Jan 2022 15:38:30
Message-Id: 1642779453.9d8b9b0771b3640134a1d58551fdcf97667d27cc.mgorny@gentoo
1 commit: 9d8b9b0771b3640134a1d58551fdcf97667d27cc
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 21 12:15:39 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=9d8b9b07
7
8 sys-libs/llvm-libunwind: Remove 13.0.1-rc{1,2}
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/llvm-libunwind/Manifest | 2 -
13 .../llvm-libunwind-13.0.1_rc1.ebuild | 142 ---------------------
14 .../llvm-libunwind-13.0.1_rc2.ebuild | 142 ---------------------
15 3 files changed, 286 deletions(-)
16
17 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
18 index c7196ba54f0a..dd7644d62981 100644
19 --- a/sys-libs/llvm-libunwind/Manifest
20 +++ b/sys-libs/llvm-libunwind/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/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild
30 deleted file mode 100644
31 index b2e400ff295b..000000000000
32 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc1.ebuild
33 +++ /dev/null
34 @@ -1,142 +0,0 @@
35 -# Copyright 1999-2021 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="C++ runtime stack unwinder from LLVM"
45 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
46 -
47 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
48 -SLOT="0"
49 -KEYWORDS=""
50 -IUSE="debug static-libs test"
51 -RESTRICT="!test? ( test )"
52 -
53 -RDEPEND="!sys-libs/libunwind"
54 -# llvm-6 for new lit options
55 -DEPEND="
56 - >=sys-devel/llvm-6"
57 -BDEPEND="
58 - test? ( >=sys-devel/clang-3.9.0
59 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
60 - )"
61 -
62 -LLVM_COMPONENTS=( libunwind libcxx llvm/cmake )
63 -LLVM_TEST_COMPONENTS=( libcxxabi )
64 -llvm.org_set_globals
65 -
66 -python_check_deps() {
67 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
68 -}
69 -
70 -pkg_setup() {
71 - use test && python-any-r1_pkg_setup
72 -}
73 -
74 -multilib_src_configure() {
75 - local use_compiler_rt=OFF
76 - local libdir=$(get_libdir)
77 -
78 - # link to compiler-rt
79 - # https://github.com/gentoo/gentoo/pull/21516
80 - if tc-is-clang; then
81 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
82 - ${LD_FLAGS} -print-libgcc-file-name)
83 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
84 - use_compiler_rt=ON
85 - fi
86 - fi
87 -
88 - local mycmakeargs=(
89 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
90 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
91 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
92 - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
93 - -DLLVM_INCLUDE_TESTS=$(usex test)
94 -
95 - # support non-native unwinding; given it's small enough,
96 - # enable it unconditionally
97 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
98 -
99 - # avoid dependency on libgcc_s if compiler-rt is used
100 - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
101 - )
102 - if use test; then
103 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
104 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
105 -
106 - mycmakeargs+=(
107 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
108 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
109 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
110 - )
111 - fi
112 -
113 - cmake_src_configure
114 -}
115 -
116 -wrap_libcxxabi() {
117 - local mycmakeargs=(
118 - -DLIBCXXABI_LIBDIR_SUFFIX=
119 - -DLIBCXXABI_ENABLE_SHARED=OFF
120 - -DLIBCXXABI_ENABLE_STATIC=ON
121 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
122 - -DLIBCXXABI_INCLUDE_TESTS=OFF
123 -
124 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
125 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
126 - )
127 -
128 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
129 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
130 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
131 -
132 - "${@}"
133 -}
134 -
135 -wrap_libcxx() {
136 - local mycmakeargs=(
137 - -DLIBCXX_LIBDIR_SUFFIX=
138 - -DLIBCXX_ENABLE_SHARED=OFF
139 - -DLIBCXX_ENABLE_STATIC=ON
140 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
141 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
142 - -DLIBCXX_CXX_ABI=libcxxabi
143 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
144 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
145 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
146 - -DLIBCXX_HAS_GCC_S_LIB=OFF
147 - -DLIBCXX_INCLUDE_TESTS=OFF
148 - )
149 -
150 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
151 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
152 - local BUILD_DIR=${BUILD_DIR}/libcxx
153 -
154 - "${@}"
155 -}
156 -
157 -multilib_src_test() {
158 - # build local copies of libc++ & libc++abi for testing to avoid
159 - # circular deps
160 - wrap_libcxx cmake_src_configure
161 - wrap_libcxx cmake_build generate-cxx-headers
162 - wrap_libcxxabi cmake_src_configure
163 - wrap_libcxxabi cmake_src_compile
164 - wrap_libcxx cmake_src_compile
165 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
166 -
167 - local -x LIT_PRESERVES_TMP=1
168 - cmake_build check-unwind
169 -}
170 -
171 -multilib_src_install() {
172 - cmake_src_install
173 -
174 - # install headers like sys-libs/libunwind
175 - doheader "${S}"/include/*.h
176 -}
177
178 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc2.ebuild
179 deleted file mode 100644
180 index bc5a62c6434a..000000000000
181 --- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.1_rc2.ebuild
182 +++ /dev/null
183 @@ -1,142 +0,0 @@
184 -# Copyright 1999-2022 Gentoo Authors
185 -# Distributed under the terms of the GNU General Public License v2
186 -
187 -EAPI=7
188 -
189 -CMAKE_ECLASS=cmake
190 -PYTHON_COMPAT=( python3_{8..10} )
191 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
192 -
193 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
194 -HOMEPAGE="https://github.com/llvm-mirror/libunwind"
195 -
196 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
197 -SLOT="0"
198 -KEYWORDS=""
199 -IUSE="debug static-libs test"
200 -RESTRICT="!test? ( test )"
201 -
202 -RDEPEND="!sys-libs/libunwind"
203 -# llvm-6 for new lit options
204 -DEPEND="
205 - >=sys-devel/llvm-6"
206 -BDEPEND="
207 - test? ( >=sys-devel/clang-3.9.0
208 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
209 - )"
210 -
211 -LLVM_COMPONENTS=( libunwind libcxx llvm/cmake )
212 -LLVM_TEST_COMPONENTS=( libcxxabi )
213 -llvm.org_set_globals
214 -
215 -python_check_deps() {
216 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
217 -}
218 -
219 -pkg_setup() {
220 - use test && python-any-r1_pkg_setup
221 -}
222 -
223 -multilib_src_configure() {
224 - local use_compiler_rt=OFF
225 - local libdir=$(get_libdir)
226 -
227 - # link to compiler-rt
228 - # https://github.com/gentoo/gentoo/pull/21516
229 - if tc-is-clang; then
230 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
231 - ${LD_FLAGS} -print-libgcc-file-name)
232 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
233 - use_compiler_rt=ON
234 - fi
235 - fi
236 -
237 - local mycmakeargs=(
238 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
239 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
240 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
241 - -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
242 - -DLLVM_INCLUDE_TESTS=$(usex test)
243 -
244 - # support non-native unwinding; given it's small enough,
245 - # enable it unconditionally
246 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
247 -
248 - # avoid dependency on libgcc_s if compiler-rt is used
249 - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
250 - )
251 - if use test; then
252 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
253 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
254 -
255 - mycmakeargs+=(
256 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
257 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
258 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
259 - )
260 - fi
261 -
262 - cmake_src_configure
263 -}
264 -
265 -wrap_libcxxabi() {
266 - local mycmakeargs=(
267 - -DLIBCXXABI_LIBDIR_SUFFIX=
268 - -DLIBCXXABI_ENABLE_SHARED=OFF
269 - -DLIBCXXABI_ENABLE_STATIC=ON
270 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
271 - -DLIBCXXABI_INCLUDE_TESTS=OFF
272 -
273 - -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
274 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
275 - )
276 -
277 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
278 - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
279 - local BUILD_DIR=${BUILD_DIR}/libcxxabi
280 -
281 - "${@}"
282 -}
283 -
284 -wrap_libcxx() {
285 - local mycmakeargs=(
286 - -DLIBCXX_LIBDIR_SUFFIX=
287 - -DLIBCXX_ENABLE_SHARED=OFF
288 - -DLIBCXX_ENABLE_STATIC=ON
289 - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
290 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
291 - -DLIBCXX_CXX_ABI=libcxxabi
292 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
293 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
294 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
295 - -DLIBCXX_HAS_GCC_S_LIB=OFF
296 - -DLIBCXX_INCLUDE_TESTS=OFF
297 - )
298 -
299 - local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
300 - local CMAKE_USE_DIR=${WORKDIR}/libcxx
301 - local BUILD_DIR=${BUILD_DIR}/libcxx
302 -
303 - "${@}"
304 -}
305 -
306 -multilib_src_test() {
307 - # build local copies of libc++ & libc++abi for testing to avoid
308 - # circular deps
309 - wrap_libcxx cmake_src_configure
310 - wrap_libcxx cmake_build generate-cxx-headers
311 - wrap_libcxxabi cmake_src_configure
312 - wrap_libcxxabi cmake_src_compile
313 - wrap_libcxx cmake_src_compile
314 - mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
315 -
316 - local -x LIT_PRESERVES_TMP=1
317 - cmake_build check-unwind
318 -}
319 -
320 -multilib_src_install() {
321 - cmake_src_install
322 -
323 - # install headers like sys-libs/libunwind
324 - doheader "${S}"/include/*.h
325 -}