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: Tue, 06 Sep 2022 08:01:11
Message-Id: 1662451212.1b91d0ca150c5e061307db89020dffe849780365.mgorny@gentoo
1 commit: 1b91d0ca150c5e061307db89020dffe849780365
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 6 08:00:12 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 6 08:00:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b91d0ca
7
8 sys-libs/libcxxabi: Remove 15.0.0 RCs
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxxabi/Manifest | 4 -
13 sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild | 128 -------------------------
14 sys-libs/libcxxabi/libcxxabi-15.0.0_rc3.ebuild | 128 -------------------------
15 3 files changed, 260 deletions(-)
16
17 diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
18 index f9548c12d98d..25f9ff7f337a 100644
19 --- a/sys-libs/libcxxabi/Manifest
20 +++ b/sys-libs/libcxxabi/Manifest
21 @@ -2,8 +2,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/libcxxabi/libcxxabi-15.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild
32 deleted file mode 100644
33 index 893a76363592..000000000000
34 --- a/sys-libs/libcxxabi/libcxxabi-15.0.0_rc2.ebuild
35 +++ /dev/null
36 @@ -1,128 +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="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="+clang static-libs test"
53 -REQUIRED_USE="test? ( clang )"
54 -RESTRICT="!test? ( test )"
55 -
56 -# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
57 -RDEPEND+="
58 - !<sys-libs/libcxx-15
59 -"
60 -# llvm-6 for new lit options
61 -DEPEND="
62 - ${RDEPEND}
63 - >=sys-devel/llvm-6
64 -"
65 -BDEPEND="
66 - clang? (
67 - sys-devel/clang
68 - )
69 - !test? (
70 - ${PYTHON_DEPS}
71 - )
72 - test? (
73 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
74 - )
75 -"
76 -
77 -LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
78 -LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
79 -llvm.org_set_globals
80 -
81 -python_check_deps() {
82 - use test || return 0
83 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
84 -}
85 -
86 -pkg_setup() {
87 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
88 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
89 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
90 - llvm_pkg_setup
91 - fi
92 - python-any-r1_pkg_setup
93 -}
94 -
95 -multilib_src_configure() {
96 - if use clang && ! tc-is-clang; then
97 - # Only do this conditionally to allow overriding with
98 - # e.g. CC=clang-13 in case of breakage
99 - local -x CC=${CHOST}-clang
100 - local -x CXX=${CHOST}-clang++
101 - strip-unsupported-flags
102 - fi
103 -
104 - # link against compiler-rt instead of libgcc if this is what clang does
105 - local want_compiler_rt=OFF
106 - if tc-is-clang; then
107 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
108 - ${LDFLAGS} -print-libgcc-file-name)
109 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
110 - want_compiler_rt=ON
111 - fi
112 - fi
113 -
114 - local libdir=$(get_libdir)
115 - local mycmakeargs=(
116 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
117 - -DPython3_EXECUTABLE="${PYTHON}"
118 - -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
119 - -DLLVM_INCLUDE_TESTS=OFF
120 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
121 - -DLIBCXXABI_ENABLE_SHARED=ON
122 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
123 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
124 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
125 -
126 - # upstream is omitting standard search path for this
127 - # probably because gcc & clang are bundling their own unwind.h
128 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
129 -
130 - -DLIBCXX_LIBDIR_SUFFIX=
131 - -DLIBCXX_ENABLE_SHARED=ON
132 - -DLIBCXX_ENABLE_STATIC=OFF
133 - -DLIBCXX_CXX_ABI=libcxxabi
134 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
135 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
136 - -DLIBCXX_HAS_GCC_S_LIB=OFF
137 - -DLIBCXX_INCLUDE_BENCHMARKS=OFF
138 - -DLIBCXX_INCLUDE_TESTS=OFF
139 - )
140 - if use test; then
141 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
142 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
143 -
144 - mycmakeargs+=(
145 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
146 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
147 - -DPython3_EXECUTABLE="${PYTHON}"
148 - )
149 - fi
150 - cmake_src_configure
151 -}
152 -
153 -multilib_src_compile() {
154 - cmake_build cxxabi
155 -}
156 -
157 -multilib_src_test() {
158 - local -x LIT_PRESERVES_TMP=1
159 - cmake_build check-cxxabi
160 -}
161 -
162 -multilib_src_install() {
163 - DESTDIR="${D}" cmake_build install-cxxabi
164 -}
165
166 diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.0_rc3.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.0_rc3.ebuild
167 deleted file mode 100644
168 index 893a76363592..000000000000
169 --- a/sys-libs/libcxxabi/libcxxabi-15.0.0_rc3.ebuild
170 +++ /dev/null
171 @@ -1,128 +0,0 @@
172 -# Copyright 1999-2022 Gentoo Authors
173 -# Distributed under the terms of the GNU General Public License v2
174 -
175 -EAPI=8
176 -
177 -PYTHON_COMPAT=( python3_{8..11} )
178 -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
179 - toolchain-funcs
180 -
181 -DESCRIPTION="Low level support for a standard C++ library"
182 -HOMEPAGE="https://libcxxabi.llvm.org/"
183 -
184 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
185 -SLOT="0"
186 -KEYWORDS=""
187 -IUSE="+clang static-libs test"
188 -REQUIRED_USE="test? ( clang )"
189 -RESTRICT="!test? ( test )"
190 -
191 -# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
192 -RDEPEND+="
193 - !<sys-libs/libcxx-15
194 -"
195 -# llvm-6 for new lit options
196 -DEPEND="
197 - ${RDEPEND}
198 - >=sys-devel/llvm-6
199 -"
200 -BDEPEND="
201 - clang? (
202 - sys-devel/clang
203 - )
204 - !test? (
205 - ${PYTHON_DEPS}
206 - )
207 - test? (
208 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
209 - )
210 -"
211 -
212 -LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
213 -LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
214 -llvm.org_set_globals
215 -
216 -python_check_deps() {
217 - use test || return 0
218 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
219 -}
220 -
221 -pkg_setup() {
222 - # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
223 - # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
224 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
225 - llvm_pkg_setup
226 - fi
227 - python-any-r1_pkg_setup
228 -}
229 -
230 -multilib_src_configure() {
231 - if use clang && ! tc-is-clang; then
232 - # Only do this conditionally to allow overriding with
233 - # e.g. CC=clang-13 in case of breakage
234 - local -x CC=${CHOST}-clang
235 - local -x CXX=${CHOST}-clang++
236 - strip-unsupported-flags
237 - fi
238 -
239 - # link against compiler-rt instead of libgcc if this is what clang does
240 - local want_compiler_rt=OFF
241 - if tc-is-clang; then
242 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
243 - ${LDFLAGS} -print-libgcc-file-name)
244 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
245 - want_compiler_rt=ON
246 - fi
247 - fi
248 -
249 - local libdir=$(get_libdir)
250 - local mycmakeargs=(
251 - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
252 - -DPython3_EXECUTABLE="${PYTHON}"
253 - -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
254 - -DLLVM_INCLUDE_TESTS=OFF
255 - -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
256 - -DLIBCXXABI_ENABLE_SHARED=ON
257 - -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
258 - -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
259 - -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
260 -
261 - # upstream is omitting standard search path for this
262 - # probably because gcc & clang are bundling their own unwind.h
263 - -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
264 -
265 - -DLIBCXX_LIBDIR_SUFFIX=
266 - -DLIBCXX_ENABLE_SHARED=ON
267 - -DLIBCXX_ENABLE_STATIC=OFF
268 - -DLIBCXX_CXX_ABI=libcxxabi
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_BENCHMARKS=OFF
273 - -DLIBCXX_INCLUDE_TESTS=OFF
274 - )
275 - if use test; then
276 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
277 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
278 -
279 - mycmakeargs+=(
280 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
281 - -DLLVM_LIT_ARGS="$(get_lit_flags)"
282 - -DPython3_EXECUTABLE="${PYTHON}"
283 - )
284 - fi
285 - cmake_src_configure
286 -}
287 -
288 -multilib_src_compile() {
289 - cmake_build cxxabi
290 -}
291 -
292 -multilib_src_test() {
293 - local -x LIT_PRESERVES_TMP=1
294 - cmake_build check-cxxabi
295 -}
296 -
297 -multilib_src_install() {
298 - DESTDIR="${D}" cmake_build install-cxxabi
299 -}