1 |
commit: d22d8e5b9c1b8a089d0223ad1964b2c68bc000a3 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 6 17:18:55 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 6 21:23:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22d8e5b |
7 |
|
8 |
sys-libs/libcxx: Remove 11.0.1 RCs and live |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-libs/libcxx/Manifest | 2 - |
13 |
sys-libs/libcxx/libcxx-11.0.1.9999.ebuild | 218 ------------------------------ |
14 |
sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild | 218 ------------------------------ |
15 |
sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild | 218 ------------------------------ |
16 |
4 files changed, 656 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest |
19 |
index 29b0efe3c21..47a7ff9f78f 100644 |
20 |
--- a/sys-libs/libcxx/Manifest |
21 |
+++ b/sys-libs/libcxx/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/libcxx/libcxx-11.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-11.0.1.9999.ebuild |
31 |
deleted file mode 100644 |
32 |
index 6bfe1aa438b..00000000000 |
33 |
--- a/sys-libs/libcxx/libcxx-11.0.1.9999.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,218 +0,0 @@ |
36 |
-# Copyright 1999-2021 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="New implementation of the C++ standard library, targeting C++11" |
46 |
-HOMEPAGE="https://libcxx.llvm.org/" |
47 |
- |
48 |
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="" |
51 |
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test" |
52 |
-REQUIRED_USE="libunwind? ( libcxxabi )" |
53 |
-RESTRICT="!test? ( test )" |
54 |
- |
55 |
-RDEPEND=" |
56 |
- libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) |
57 |
- !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )" |
58 |
-# llvm-6 for new lit options |
59 |
-# clang-3.9.0 installs necessary target symlinks unconditionally |
60 |
-# which removes the need for MULTILIB_USEDEP |
61 |
-DEPEND="${RDEPEND} |
62 |
- >=sys-devel/llvm-6" |
63 |
-BDEPEND=" |
64 |
- test? ( |
65 |
- >=dev-util/cmake-3.16 |
66 |
- >=sys-devel/clang-3.9.0 |
67 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
68 |
- )" |
69 |
- |
70 |
-DOCS=( CREDITS.TXT ) |
71 |
- |
72 |
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) |
73 |
-llvm.org_set_globals |
74 |
- |
75 |
-python_check_deps() { |
76 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
77 |
-} |
78 |
- |
79 |
-pkg_setup() { |
80 |
- # Darwin Prefix builds do not have llvm installed yet, so rely on |
81 |
- # bootstrap-prefix to set the appropriate path vars to LLVM instead |
82 |
- # of using llvm_pkg_setup. |
83 |
- if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
84 |
- llvm_pkg_setup |
85 |
- fi |
86 |
- use test && python-any-r1_pkg_setup |
87 |
- |
88 |
- if ! use libcxxabi && ! tc-is-gcc ; then |
89 |
- eerror "To build ${PN} against libsupc++, you have to use gcc. Other" |
90 |
- eerror "compilers are not supported. Please set CC=gcc and CXX=g++" |
91 |
- eerror "and try again." |
92 |
- die |
93 |
- fi |
94 |
-} |
95 |
- |
96 |
-src_prepare() { |
97 |
- # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a |
98 |
- # out-of-tree build. |
99 |
- eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" |
100 |
- |
101 |
- llvm.org_src_prepare |
102 |
-} |
103 |
- |
104 |
-test_compiler() { |
105 |
- $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
106 |
- <<<'int main() { return 0; }' &>/dev/null |
107 |
-} |
108 |
- |
109 |
-src_configure() { |
110 |
- # note: we need to do this before multilib kicks in since it will |
111 |
- # alter the CHOST |
112 |
- local cxxabi cxxabi_incs |
113 |
- if use libcxxabi; then |
114 |
- cxxabi=libcxxabi |
115 |
- cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" |
116 |
- else |
117 |
- local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" |
118 |
- cxxabi=libsupc++ |
119 |
- cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
120 |
- fi |
121 |
- |
122 |
- multilib-minimal_src_configure |
123 |
-} |
124 |
- |
125 |
-multilib_src_configure() { |
126 |
- # we want -lgcc_s for unwinder, and for compiler runtime when using |
127 |
- # gcc, clang with gcc runtime (or any unknown compiler) |
128 |
- local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF |
129 |
- if use libunwind; then |
130 |
- # work-around missing -lunwind upstream |
131 |
- extra_libs+=( -lunwind ) |
132 |
- # if we're using libunwind and clang with compiler-rt, we want |
133 |
- # to link to compiler-rt instead of -lgcc_s |
134 |
- if tc-is-clang; then |
135 |
- local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
136 |
- ${LDFLAGS} -print-libgcc-file-name) |
137 |
- if [[ ${compiler_rt} == *libclang_rt* ]]; then |
138 |
- want_gcc_s=OFF |
139 |
- want_compiler_rt=ON |
140 |
- extra_libs+=( "${compiler_rt}" ) |
141 |
- fi |
142 |
- fi |
143 |
- elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then |
144 |
- # clang-based darwin prefix disables libunwind useflag during |
145 |
- # bootstrap, because libunwind is not in the prefix yet. |
146 |
- # override the default, though, because clang based libcxx |
147 |
- # should never use gcc_s on Darwin. |
148 |
- want_gcc_s=OFF |
149 |
- # compiler_rt is not available in EPREFIX during bootstrap, |
150 |
- # so we cannot link to it yet anyway, so keep the defaults |
151 |
- # of want_compiler_rt=OFF and extra_libs=() |
152 |
- fi |
153 |
- |
154 |
- # bootstrap: cmake is unhappy if compiler can't link to stdlib |
155 |
- local nolib_flags=( -nodefaultlibs -lc ) |
156 |
- if ! test_compiler; then |
157 |
- if test_compiler "${nolib_flags[@]}"; then |
158 |
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
159 |
- ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" |
160 |
- fi |
161 |
- fi |
162 |
- |
163 |
- local libdir=$(get_libdir) |
164 |
- local mycmakeargs=( |
165 |
- -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} |
166 |
- -DLIBCXX_ENABLE_SHARED=ON |
167 |
- -DLIBCXX_ENABLE_STATIC=$(usex static-libs) |
168 |
- -DLIBCXX_CXX_ABI=${cxxabi} |
169 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} |
170 |
- # we're using our own mechanism for generating linker scripts |
171 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
172 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
173 |
- -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
174 |
- -DLIBCXX_INCLUDE_TESTS=$(usex test) |
175 |
- -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
176 |
- -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
177 |
- ) |
178 |
- |
179 |
- if use test; then |
180 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
181 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
182 |
- |
183 |
- mycmakeargs+=( |
184 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
185 |
- -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
186 |
- -DPython3_EXECUTABLE="${PYTHON}" |
187 |
- ) |
188 |
- fi |
189 |
- cmake_src_configure |
190 |
-} |
191 |
- |
192 |
-multilib_src_test() { |
193 |
- local -x LIT_PRESERVES_TMP=1 |
194 |
- cmake_build check-cxx |
195 |
-} |
196 |
- |
197 |
-# Usage: deps |
198 |
-gen_ldscript() { |
199 |
- local output_format |
200 |
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
201 |
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
202 |
- |
203 |
- cat <<-END_LDSCRIPT |
204 |
-/* GNU ld script |
205 |
- Include missing dependencies |
206 |
-*/ |
207 |
-${output_format} |
208 |
-GROUP ( $@ ) |
209 |
-END_LDSCRIPT |
210 |
-} |
211 |
- |
212 |
-gen_static_ldscript() { |
213 |
- local libdir=$(get_libdir) |
214 |
- local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a") |
215 |
- |
216 |
- # Move it first. |
217 |
- mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die |
218 |
- # Generate libc++.a ldscript for inclusion of its dependencies so that |
219 |
- # clang++ -stdlib=libc++ -static works out of the box. |
220 |
- local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" |
221 |
- # On Linux/glibc it does not link without libpthread or libdl. It is |
222 |
- # fine on FreeBSD. |
223 |
- use elibc_glibc && deps+=" libpthread.a libdl.a" |
224 |
- |
225 |
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die |
226 |
-} |
227 |
- |
228 |
-gen_shared_ldscript() { |
229 |
- local libdir=$(get_libdir) |
230 |
- # libsupc++ doesn't have a shared version |
231 |
- local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a") |
232 |
- |
233 |
- mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die |
234 |
- local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" |
235 |
- |
236 |
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die |
237 |
-} |
238 |
- |
239 |
-multilib_src_install() { |
240 |
- cmake_src_install |
241 |
- if [[ ${CHOST} != *-darwin* ]] ; then |
242 |
- gen_shared_ldscript |
243 |
- use static-libs && gen_static_ldscript |
244 |
- fi |
245 |
-} |
246 |
- |
247 |
-pkg_postinst() { |
248 |
- elog "This package (${PN}) is mainly intended as a replacement for the C++" |
249 |
- elog "standard library when using clang." |
250 |
- elog "To use it, instead of libstdc++, use:" |
251 |
- elog " clang++ -stdlib=libc++" |
252 |
- elog "to compile your C++ programs." |
253 |
-} |
254 |
|
255 |
diff --git a/sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild b/sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild |
256 |
deleted file mode 100644 |
257 |
index 6bfe1aa438b..00000000000 |
258 |
--- a/sys-libs/libcxx/libcxx-11.0.1_rc1.ebuild |
259 |
+++ /dev/null |
260 |
@@ -1,218 +0,0 @@ |
261 |
-# Copyright 1999-2021 Gentoo Authors |
262 |
-# Distributed under the terms of the GNU General Public License v2 |
263 |
- |
264 |
-EAPI=7 |
265 |
- |
266 |
-CMAKE_ECLASS=cmake |
267 |
-PYTHON_COMPAT=( python3_{6..9} ) |
268 |
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs |
269 |
- |
270 |
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
271 |
-HOMEPAGE="https://libcxx.llvm.org/" |
272 |
- |
273 |
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
274 |
-SLOT="0" |
275 |
-KEYWORDS="" |
276 |
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test" |
277 |
-REQUIRED_USE="libunwind? ( libcxxabi )" |
278 |
-RESTRICT="!test? ( test )" |
279 |
- |
280 |
-RDEPEND=" |
281 |
- libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) |
282 |
- !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )" |
283 |
-# llvm-6 for new lit options |
284 |
-# clang-3.9.0 installs necessary target symlinks unconditionally |
285 |
-# which removes the need for MULTILIB_USEDEP |
286 |
-DEPEND="${RDEPEND} |
287 |
- >=sys-devel/llvm-6" |
288 |
-BDEPEND=" |
289 |
- test? ( |
290 |
- >=dev-util/cmake-3.16 |
291 |
- >=sys-devel/clang-3.9.0 |
292 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
293 |
- )" |
294 |
- |
295 |
-DOCS=( CREDITS.TXT ) |
296 |
- |
297 |
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) |
298 |
-llvm.org_set_globals |
299 |
- |
300 |
-python_check_deps() { |
301 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
302 |
-} |
303 |
- |
304 |
-pkg_setup() { |
305 |
- # Darwin Prefix builds do not have llvm installed yet, so rely on |
306 |
- # bootstrap-prefix to set the appropriate path vars to LLVM instead |
307 |
- # of using llvm_pkg_setup. |
308 |
- if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
309 |
- llvm_pkg_setup |
310 |
- fi |
311 |
- use test && python-any-r1_pkg_setup |
312 |
- |
313 |
- if ! use libcxxabi && ! tc-is-gcc ; then |
314 |
- eerror "To build ${PN} against libsupc++, you have to use gcc. Other" |
315 |
- eerror "compilers are not supported. Please set CC=gcc and CXX=g++" |
316 |
- eerror "and try again." |
317 |
- die |
318 |
- fi |
319 |
-} |
320 |
- |
321 |
-src_prepare() { |
322 |
- # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a |
323 |
- # out-of-tree build. |
324 |
- eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" |
325 |
- |
326 |
- llvm.org_src_prepare |
327 |
-} |
328 |
- |
329 |
-test_compiler() { |
330 |
- $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
331 |
- <<<'int main() { return 0; }' &>/dev/null |
332 |
-} |
333 |
- |
334 |
-src_configure() { |
335 |
- # note: we need to do this before multilib kicks in since it will |
336 |
- # alter the CHOST |
337 |
- local cxxabi cxxabi_incs |
338 |
- if use libcxxabi; then |
339 |
- cxxabi=libcxxabi |
340 |
- cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" |
341 |
- else |
342 |
- local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" |
343 |
- cxxabi=libsupc++ |
344 |
- cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
345 |
- fi |
346 |
- |
347 |
- multilib-minimal_src_configure |
348 |
-} |
349 |
- |
350 |
-multilib_src_configure() { |
351 |
- # we want -lgcc_s for unwinder, and for compiler runtime when using |
352 |
- # gcc, clang with gcc runtime (or any unknown compiler) |
353 |
- local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF |
354 |
- if use libunwind; then |
355 |
- # work-around missing -lunwind upstream |
356 |
- extra_libs+=( -lunwind ) |
357 |
- # if we're using libunwind and clang with compiler-rt, we want |
358 |
- # to link to compiler-rt instead of -lgcc_s |
359 |
- if tc-is-clang; then |
360 |
- local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
361 |
- ${LDFLAGS} -print-libgcc-file-name) |
362 |
- if [[ ${compiler_rt} == *libclang_rt* ]]; then |
363 |
- want_gcc_s=OFF |
364 |
- want_compiler_rt=ON |
365 |
- extra_libs+=( "${compiler_rt}" ) |
366 |
- fi |
367 |
- fi |
368 |
- elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then |
369 |
- # clang-based darwin prefix disables libunwind useflag during |
370 |
- # bootstrap, because libunwind is not in the prefix yet. |
371 |
- # override the default, though, because clang based libcxx |
372 |
- # should never use gcc_s on Darwin. |
373 |
- want_gcc_s=OFF |
374 |
- # compiler_rt is not available in EPREFIX during bootstrap, |
375 |
- # so we cannot link to it yet anyway, so keep the defaults |
376 |
- # of want_compiler_rt=OFF and extra_libs=() |
377 |
- fi |
378 |
- |
379 |
- # bootstrap: cmake is unhappy if compiler can't link to stdlib |
380 |
- local nolib_flags=( -nodefaultlibs -lc ) |
381 |
- if ! test_compiler; then |
382 |
- if test_compiler "${nolib_flags[@]}"; then |
383 |
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
384 |
- ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" |
385 |
- fi |
386 |
- fi |
387 |
- |
388 |
- local libdir=$(get_libdir) |
389 |
- local mycmakeargs=( |
390 |
- -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} |
391 |
- -DLIBCXX_ENABLE_SHARED=ON |
392 |
- -DLIBCXX_ENABLE_STATIC=$(usex static-libs) |
393 |
- -DLIBCXX_CXX_ABI=${cxxabi} |
394 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} |
395 |
- # we're using our own mechanism for generating linker scripts |
396 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
397 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
398 |
- -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
399 |
- -DLIBCXX_INCLUDE_TESTS=$(usex test) |
400 |
- -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
401 |
- -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
402 |
- ) |
403 |
- |
404 |
- if use test; then |
405 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
406 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
407 |
- |
408 |
- mycmakeargs+=( |
409 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
410 |
- -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
411 |
- -DPython3_EXECUTABLE="${PYTHON}" |
412 |
- ) |
413 |
- fi |
414 |
- cmake_src_configure |
415 |
-} |
416 |
- |
417 |
-multilib_src_test() { |
418 |
- local -x LIT_PRESERVES_TMP=1 |
419 |
- cmake_build check-cxx |
420 |
-} |
421 |
- |
422 |
-# Usage: deps |
423 |
-gen_ldscript() { |
424 |
- local output_format |
425 |
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
426 |
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
427 |
- |
428 |
- cat <<-END_LDSCRIPT |
429 |
-/* GNU ld script |
430 |
- Include missing dependencies |
431 |
-*/ |
432 |
-${output_format} |
433 |
-GROUP ( $@ ) |
434 |
-END_LDSCRIPT |
435 |
-} |
436 |
- |
437 |
-gen_static_ldscript() { |
438 |
- local libdir=$(get_libdir) |
439 |
- local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a") |
440 |
- |
441 |
- # Move it first. |
442 |
- mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die |
443 |
- # Generate libc++.a ldscript for inclusion of its dependencies so that |
444 |
- # clang++ -stdlib=libc++ -static works out of the box. |
445 |
- local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" |
446 |
- # On Linux/glibc it does not link without libpthread or libdl. It is |
447 |
- # fine on FreeBSD. |
448 |
- use elibc_glibc && deps+=" libpthread.a libdl.a" |
449 |
- |
450 |
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die |
451 |
-} |
452 |
- |
453 |
-gen_shared_ldscript() { |
454 |
- local libdir=$(get_libdir) |
455 |
- # libsupc++ doesn't have a shared version |
456 |
- local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a") |
457 |
- |
458 |
- mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die |
459 |
- local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" |
460 |
- |
461 |
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die |
462 |
-} |
463 |
- |
464 |
-multilib_src_install() { |
465 |
- cmake_src_install |
466 |
- if [[ ${CHOST} != *-darwin* ]] ; then |
467 |
- gen_shared_ldscript |
468 |
- use static-libs && gen_static_ldscript |
469 |
- fi |
470 |
-} |
471 |
- |
472 |
-pkg_postinst() { |
473 |
- elog "This package (${PN}) is mainly intended as a replacement for the C++" |
474 |
- elog "standard library when using clang." |
475 |
- elog "To use it, instead of libstdc++, use:" |
476 |
- elog " clang++ -stdlib=libc++" |
477 |
- elog "to compile your C++ programs." |
478 |
-} |
479 |
|
480 |
diff --git a/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild b/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild |
481 |
deleted file mode 100644 |
482 |
index 6bfe1aa438b..00000000000 |
483 |
--- a/sys-libs/libcxx/libcxx-11.0.1_rc2.ebuild |
484 |
+++ /dev/null |
485 |
@@ -1,218 +0,0 @@ |
486 |
-# Copyright 1999-2021 Gentoo Authors |
487 |
-# Distributed under the terms of the GNU General Public License v2 |
488 |
- |
489 |
-EAPI=7 |
490 |
- |
491 |
-CMAKE_ECLASS=cmake |
492 |
-PYTHON_COMPAT=( python3_{6..9} ) |
493 |
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs |
494 |
- |
495 |
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
496 |
-HOMEPAGE="https://libcxx.llvm.org/" |
497 |
- |
498 |
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
499 |
-SLOT="0" |
500 |
-KEYWORDS="" |
501 |
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test" |
502 |
-REQUIRED_USE="libunwind? ( libcxxabi )" |
503 |
-RESTRICT="!test? ( test )" |
504 |
- |
505 |
-RDEPEND=" |
506 |
- libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) |
507 |
- !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )" |
508 |
-# llvm-6 for new lit options |
509 |
-# clang-3.9.0 installs necessary target symlinks unconditionally |
510 |
-# which removes the need for MULTILIB_USEDEP |
511 |
-DEPEND="${RDEPEND} |
512 |
- >=sys-devel/llvm-6" |
513 |
-BDEPEND=" |
514 |
- test? ( |
515 |
- >=dev-util/cmake-3.16 |
516 |
- >=sys-devel/clang-3.9.0 |
517 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
518 |
- )" |
519 |
- |
520 |
-DOCS=( CREDITS.TXT ) |
521 |
- |
522 |
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) |
523 |
-llvm.org_set_globals |
524 |
- |
525 |
-python_check_deps() { |
526 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
527 |
-} |
528 |
- |
529 |
-pkg_setup() { |
530 |
- # Darwin Prefix builds do not have llvm installed yet, so rely on |
531 |
- # bootstrap-prefix to set the appropriate path vars to LLVM instead |
532 |
- # of using llvm_pkg_setup. |
533 |
- if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
534 |
- llvm_pkg_setup |
535 |
- fi |
536 |
- use test && python-any-r1_pkg_setup |
537 |
- |
538 |
- if ! use libcxxabi && ! tc-is-gcc ; then |
539 |
- eerror "To build ${PN} against libsupc++, you have to use gcc. Other" |
540 |
- eerror "compilers are not supported. Please set CC=gcc and CXX=g++" |
541 |
- eerror "and try again." |
542 |
- die |
543 |
- fi |
544 |
-} |
545 |
- |
546 |
-src_prepare() { |
547 |
- # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a |
548 |
- # out-of-tree build. |
549 |
- eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" |
550 |
- |
551 |
- llvm.org_src_prepare |
552 |
-} |
553 |
- |
554 |
-test_compiler() { |
555 |
- $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
556 |
- <<<'int main() { return 0; }' &>/dev/null |
557 |
-} |
558 |
- |
559 |
-src_configure() { |
560 |
- # note: we need to do this before multilib kicks in since it will |
561 |
- # alter the CHOST |
562 |
- local cxxabi cxxabi_incs |
563 |
- if use libcxxabi; then |
564 |
- cxxabi=libcxxabi |
565 |
- cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" |
566 |
- else |
567 |
- local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" |
568 |
- cxxabi=libsupc++ |
569 |
- cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
570 |
- fi |
571 |
- |
572 |
- multilib-minimal_src_configure |
573 |
-} |
574 |
- |
575 |
-multilib_src_configure() { |
576 |
- # we want -lgcc_s for unwinder, and for compiler runtime when using |
577 |
- # gcc, clang with gcc runtime (or any unknown compiler) |
578 |
- local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF |
579 |
- if use libunwind; then |
580 |
- # work-around missing -lunwind upstream |
581 |
- extra_libs+=( -lunwind ) |
582 |
- # if we're using libunwind and clang with compiler-rt, we want |
583 |
- # to link to compiler-rt instead of -lgcc_s |
584 |
- if tc-is-clang; then |
585 |
- local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
586 |
- ${LDFLAGS} -print-libgcc-file-name) |
587 |
- if [[ ${compiler_rt} == *libclang_rt* ]]; then |
588 |
- want_gcc_s=OFF |
589 |
- want_compiler_rt=ON |
590 |
- extra_libs+=( "${compiler_rt}" ) |
591 |
- fi |
592 |
- fi |
593 |
- elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then |
594 |
- # clang-based darwin prefix disables libunwind useflag during |
595 |
- # bootstrap, because libunwind is not in the prefix yet. |
596 |
- # override the default, though, because clang based libcxx |
597 |
- # should never use gcc_s on Darwin. |
598 |
- want_gcc_s=OFF |
599 |
- # compiler_rt is not available in EPREFIX during bootstrap, |
600 |
- # so we cannot link to it yet anyway, so keep the defaults |
601 |
- # of want_compiler_rt=OFF and extra_libs=() |
602 |
- fi |
603 |
- |
604 |
- # bootstrap: cmake is unhappy if compiler can't link to stdlib |
605 |
- local nolib_flags=( -nodefaultlibs -lc ) |
606 |
- if ! test_compiler; then |
607 |
- if test_compiler "${nolib_flags[@]}"; then |
608 |
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
609 |
- ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" |
610 |
- fi |
611 |
- fi |
612 |
- |
613 |
- local libdir=$(get_libdir) |
614 |
- local mycmakeargs=( |
615 |
- -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} |
616 |
- -DLIBCXX_ENABLE_SHARED=ON |
617 |
- -DLIBCXX_ENABLE_STATIC=$(usex static-libs) |
618 |
- -DLIBCXX_CXX_ABI=${cxxabi} |
619 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} |
620 |
- # we're using our own mechanism for generating linker scripts |
621 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
622 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
623 |
- -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
624 |
- -DLIBCXX_INCLUDE_TESTS=$(usex test) |
625 |
- -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
626 |
- -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
627 |
- ) |
628 |
- |
629 |
- if use test; then |
630 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
631 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
632 |
- |
633 |
- mycmakeargs+=( |
634 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
635 |
- -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
636 |
- -DPython3_EXECUTABLE="${PYTHON}" |
637 |
- ) |
638 |
- fi |
639 |
- cmake_src_configure |
640 |
-} |
641 |
- |
642 |
-multilib_src_test() { |
643 |
- local -x LIT_PRESERVES_TMP=1 |
644 |
- cmake_build check-cxx |
645 |
-} |
646 |
- |
647 |
-# Usage: deps |
648 |
-gen_ldscript() { |
649 |
- local output_format |
650 |
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
651 |
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
652 |
- |
653 |
- cat <<-END_LDSCRIPT |
654 |
-/* GNU ld script |
655 |
- Include missing dependencies |
656 |
-*/ |
657 |
-${output_format} |
658 |
-GROUP ( $@ ) |
659 |
-END_LDSCRIPT |
660 |
-} |
661 |
- |
662 |
-gen_static_ldscript() { |
663 |
- local libdir=$(get_libdir) |
664 |
- local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a") |
665 |
- |
666 |
- # Move it first. |
667 |
- mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die |
668 |
- # Generate libc++.a ldscript for inclusion of its dependencies so that |
669 |
- # clang++ -stdlib=libc++ -static works out of the box. |
670 |
- local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" |
671 |
- # On Linux/glibc it does not link without libpthread or libdl. It is |
672 |
- # fine on FreeBSD. |
673 |
- use elibc_glibc && deps+=" libpthread.a libdl.a" |
674 |
- |
675 |
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die |
676 |
-} |
677 |
- |
678 |
-gen_shared_ldscript() { |
679 |
- local libdir=$(get_libdir) |
680 |
- # libsupc++ doesn't have a shared version |
681 |
- local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a") |
682 |
- |
683 |
- mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die |
684 |
- local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" |
685 |
- |
686 |
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die |
687 |
-} |
688 |
- |
689 |
-multilib_src_install() { |
690 |
- cmake_src_install |
691 |
- if [[ ${CHOST} != *-darwin* ]] ; then |
692 |
- gen_shared_ldscript |
693 |
- use static-libs && gen_static_ldscript |
694 |
- fi |
695 |
-} |
696 |
- |
697 |
-pkg_postinst() { |
698 |
- elog "This package (${PN}) is mainly intended as a replacement for the C++" |
699 |
- elog "standard library when using clang." |
700 |
- elog "To use it, instead of libstdc++, use:" |
701 |
- elog " clang++ -stdlib=libc++" |
702 |
- elog "to compile your C++ programs." |
703 |
-} |