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: Tue, 06 Sep 2022 08:01:12
Message-Id: 1662451213.8860ee38802017fedc3ea835913425dd76cb4f16.mgorny@gentoo
1 commit: 8860ee38802017fedc3ea835913425dd76cb4f16
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 6 08:00:13 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 6 08:00:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8860ee38
7
8 sys-libs/llvm-libunwind: Remove 15.0.0 RCs
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/llvm-libunwind/Manifest | 4 -
13 .../llvm-libunwind-15.0.0_rc2.ebuild | 123 ---------------------
14 .../llvm-libunwind-15.0.0_rc3.ebuild | 123 ---------------------
15 3 files changed, 250 deletions(-)
16
17 diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
18 index d8ff10c94571..6e5d6404a1a7 100644
19 --- a/sys-libs/llvm-libunwind/Manifest
20 +++ b/sys-libs/llvm-libunwind/Manifest
21 @@ -3,8 +3,4 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
22 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
23 DIST llvm-project-15.0.0.src.tar.xz 112062796 BLAKE2B 947917b6c75cbd8882133dc01f57013523274962371ac5ae4a22b010f8a7d5d31288c1d9847bf19ba919fa3110fe34a8ff937107fe19bd064ed87bf4d08d8a51 SHA512 e5aacbe7574dcec62017cc03c9fa2ee4cf075125a3d6c3975c38f06e91adcebb1ff92bcf40c6dd67db087813c60b15a04f1424c713d751199518b58025ce87fc
24 DIST llvm-project-15.0.0.src.tar.xz.sig 438 BLAKE2B 8eb12c259f94d8f867a31dbe05128adc1f9cc7ec8bcbdbe1738d2fad461f5d214e674f080f7f29b639a7a75f9c5b56c0f959f538697d647b94b97dc56b036e5f SHA512 4096464a46e07575b7cff448ff8bbc38fe972505f366b744419a06339cf32b93266b0fae5390879859041ce6710e4b675ed3ea7561d6a817623d7ece0e969661
25 -DIST llvm-project-15.0.0rc2.src.tar.xz 112110968 BLAKE2B 98c3769f17f1958fbec771409eef781f5ca845363656c70fe5cd20bca1b8471e7a8773a7d4e395700c297a5f3f208fe1303cf18e2a73b45388b782fb7484106b SHA512 eee1bee1f83cc468fb4bb6839acbd5c1618dc35f35e51cd078288b91bad95d52edaadd05c88f2d72d51c1c338ba08b3346c070a28693b1224639eb7a1ef4a4d9
26 -DIST llvm-project-15.0.0rc2.src.tar.xz.sig 438 BLAKE2B 09f260b30724b41b27ef621929c086fd6c13bde51c4adb880897b549b2d336682f617faf3dd636ceb795e329b664972cf50745ab49f84e7540658d53074510da SHA512 9f695a309fbb15026dc133eb17d33abd26831eb036fad79dd8df37d4f4d9eeae1ca463acd037d2a1882bc2cff763e4bda507d1d827d845613bfd62d0f9fbd4ca
27 -DIST llvm-project-15.0.0rc3.src.tar.xz 112081940 BLAKE2B 659359f8366ad09051fa2256c1aae8cea2049ab6428ce6b15a6845f7ee01a27bc2be2ab612adf8364cb2d699f19d09a7ea01eda74b266f14cc844662bcc833e0 SHA512 e4ac310c19fd6b710d372b9a53dffaf6736d4b5c23190fa98536be40f7c4e45670957dcbfb337e9d1dd44398df43d1ae736063eff2b2fd3d6fc752fae286d3bb
28 -DIST llvm-project-15.0.0rc3.src.tar.xz.sig 438 BLAKE2B 455181d3845ff1766f463d0e02caf72df8106dad16b8d54234f7f2fa0fcb5636abb06b2d35b5fdb8a3ed5c92a41a47d413d1bb76013cb914ce79913479a786e2 SHA512 80a67cf48186d2fbde997707e5d3d7a2dc3097f07e32ff45277e5185eb358d6b292821d8eaf8570fcc45560340663d62adb0380c675909c4c9c713e52704c800
29 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
30
31 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild
32 deleted file mode 100644
33 index 2decc6f4c6ee..000000000000
34 --- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc2.ebuild
35 +++ /dev/null
36 @@ -1,123 +0,0 @@
37 -# Copyright 1999-2022 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=8
41 -
42 -PYTHON_COMPAT=( python3_{8..11} )
43 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
44 - toolchain-funcs
45 -
46 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
47 -HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
48 -
49 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
50 -SLOT="0"
51 -KEYWORDS=""
52 -IUSE="+clang debug static-libs test"
53 -REQUIRED_USE="test? ( clang )"
54 -RESTRICT="!test? ( test )"
55 -
56 -RDEPEND="
57 - !sys-libs/libunwind
58 -"
59 -# llvm-6 for new lit options
60 -DEPEND="
61 - >=sys-devel/llvm-6
62 -"
63 -BDEPEND="
64 - clang? (
65 - sys-devel/clang
66 - )
67 - !test? (
68 - ${PYTHON_DEPS}
69 - )
70 - test? (
71 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
72 - )
73 -"
74 -
75 -LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
76 -LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
77 -llvm.org_set_globals
78 -
79 -python_check_deps() {
80 - use test || return 0
81 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
82 -}
83 -
84 -multilib_src_configure() {
85 - local use_compiler_rt=OFF
86 - local libdir=$(get_libdir)
87 -
88 - if use clang && ! tc-is-clang; then
89 - # Only do this conditionally to allow overriding with
90 - # e.g. CC=clang-13 in case of breakage
91 - local -x CC=${CHOST}-clang
92 - local -x CXX=${CHOST}-clang++
93 - strip-unsupported-flags
94 - fi
95 -
96 - # link to compiler-rt
97 - # https://github.com/gentoo/gentoo/pull/21516
98 - if tc-is-clang; then
99 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
100 - ${LD_FLAGS} -print-libgcc-file-name)
101 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
102 - use_compiler_rt=ON
103 - fi
104 - fi
105 -
106 - local mycmakeargs=(
107 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
108 - -DPython3_EXECUTABLE="${PYTHON}"
109 - -DLLVM_ENABLE_RUNTIMES="libunwind"
110 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
111 - -DLLVM_INCLUDE_TESTS=OFF
112 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
113 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
114 - -DLIBUNWIND_INCLUDE_TESTS=$(usex test)
115 - -DLIBUNWIND_INSTALL_HEADERS=ON
116 -
117 - # support non-native unwinding; given it's small enough,
118 - # enable it unconditionally
119 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
120 -
121 - # avoid dependency on libgcc_s if compiler-rt is used
122 - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
123 - )
124 - if use test; then
125 - mycmakeargs+=(
126 - -DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
127 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
128 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
129 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
130 -
131 - -DLIBCXXABI_LIBDIR_SUFFIX=
132 - -DLIBCXXABI_ENABLE_SHARED=OFF
133 - -DLIBCXXABI_ENABLE_STATIC=ON
134 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
135 - -DLIBCXXABI_INCLUDE_TESTS=OFF
136 -
137 - -DLIBCXX_LIBDIR_SUFFIX=
138 - -DLIBCXX_ENABLE_SHARED=OFF
139 - -DLIBCXX_ENABLE_STATIC=ON
140 - -DLIBCXX_CXX_ABI=libcxxabi
141 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
142 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
143 - -DLIBCXX_HAS_GCC_S_LIB=OFF
144 - -DLIBCXX_INCLUDE_TESTS=OFF
145 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
146 - )
147 - fi
148 -
149 - cmake_src_configure
150 -}
151 -
152 -multilib_src_test() {
153 - local -x LIT_PRESERVES_TMP=1
154 - cmake_build check-unwind
155 -}
156 -
157 -multilib_src_install() {
158 - DESTDIR=${D} cmake_build install-unwind
159 -}
160
161 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc3.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc3.ebuild
162 deleted file mode 100644
163 index 2decc6f4c6ee..000000000000
164 --- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0_rc3.ebuild
165 +++ /dev/null
166 @@ -1,123 +0,0 @@
167 -# Copyright 1999-2022 Gentoo Authors
168 -# Distributed under the terms of the GNU General Public License v2
169 -
170 -EAPI=8
171 -
172 -PYTHON_COMPAT=( python3_{8..11} )
173 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
174 - toolchain-funcs
175 -
176 -DESCRIPTION="C++ runtime stack unwinder from LLVM"
177 -HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
178 -
179 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
180 -SLOT="0"
181 -KEYWORDS=""
182 -IUSE="+clang debug static-libs test"
183 -REQUIRED_USE="test? ( clang )"
184 -RESTRICT="!test? ( test )"
185 -
186 -RDEPEND="
187 - !sys-libs/libunwind
188 -"
189 -# llvm-6 for new lit options
190 -DEPEND="
191 - >=sys-devel/llvm-6
192 -"
193 -BDEPEND="
194 - clang? (
195 - sys-devel/clang
196 - )
197 - !test? (
198 - ${PYTHON_DEPS}
199 - )
200 - test? (
201 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
202 - )
203 -"
204 -
205 -LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
206 -LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
207 -llvm.org_set_globals
208 -
209 -python_check_deps() {
210 - use test || return 0
211 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
212 -}
213 -
214 -multilib_src_configure() {
215 - local use_compiler_rt=OFF
216 - local libdir=$(get_libdir)
217 -
218 - if use clang && ! tc-is-clang; then
219 - # Only do this conditionally to allow overriding with
220 - # e.g. CC=clang-13 in case of breakage
221 - local -x CC=${CHOST}-clang
222 - local -x CXX=${CHOST}-clang++
223 - strip-unsupported-flags
224 - fi
225 -
226 - # link to compiler-rt
227 - # https://github.com/gentoo/gentoo/pull/21516
228 - if tc-is-clang; then
229 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
230 - ${LD_FLAGS} -print-libgcc-file-name)
231 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
232 - use_compiler_rt=ON
233 - fi
234 - fi
235 -
236 - local mycmakeargs=(
237 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
238 - -DPython3_EXECUTABLE="${PYTHON}"
239 - -DLLVM_ENABLE_RUNTIMES="libunwind"
240 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
241 - -DLLVM_INCLUDE_TESTS=OFF
242 - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
243 - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
244 - -DLIBUNWIND_INCLUDE_TESTS=$(usex test)
245 - -DLIBUNWIND_INSTALL_HEADERS=ON
246 -
247 - # support non-native unwinding; given it's small enough,
248 - # enable it unconditionally
249 - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
250 -
251 - # avoid dependency on libgcc_s if compiler-rt is used
252 - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
253 - )
254 - if use test; then
255 - mycmakeargs+=(
256 - -DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
257 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
258 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
259 - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
260 -
261 - -DLIBCXXABI_LIBDIR_SUFFIX=
262 - -DLIBCXXABI_ENABLE_SHARED=OFF
263 - -DLIBCXXABI_ENABLE_STATIC=ON
264 - -DLIBCXXABI_USE_LLVM_UNWINDER=ON
265 - -DLIBCXXABI_INCLUDE_TESTS=OFF
266 -
267 - -DLIBCXX_LIBDIR_SUFFIX=
268 - -DLIBCXX_ENABLE_SHARED=OFF
269 - -DLIBCXX_ENABLE_STATIC=ON
270 - -DLIBCXX_CXX_ABI=libcxxabi
271 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
272 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
273 - -DLIBCXX_HAS_GCC_S_LIB=OFF
274 - -DLIBCXX_INCLUDE_TESTS=OFF
275 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
276 - )
277 - fi
278 -
279 - cmake_src_configure
280 -}
281 -
282 -multilib_src_test() {
283 - local -x LIT_PRESERVES_TMP=1
284 - cmake_build check-unwind
285 -}
286 -
287 -multilib_src_install() {
288 - DESTDIR=${D} cmake_build install-unwind
289 -}