1 |
commit: 67ba0ec7df48a7e0a402934d0e5c5d15e3c4b8f4 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 9 08:43:28 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 9 14:44:33 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ba0ec7 |
7 |
|
8 |
sys-libs/libcxx: Remove 12.0.1-rc4 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-libs/libcxx/Manifest | 2 - |
13 |
sys-libs/libcxx/libcxx-12.0.1_rc4.ebuild | 212 ------------------------------- |
14 |
2 files changed, 214 deletions(-) |
15 |
|
16 |
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest |
17 |
index 4f62846c44d..9cc93e93f03 100644 |
18 |
--- a/sys-libs/libcxx/Manifest |
19 |
+++ b/sys-libs/libcxx/Manifest |
20 |
@@ -1,11 +1,9 @@ |
21 |
DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0 |
22 |
DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b |
23 |
DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1 |
24 |
-DIST llvm-gentoo-patchset-12.0.1-rc4-1.tar.xz 4776 BLAKE2B 2ae7994089922805c9b82268e4c73d9a70edbb8860af7e593da904c673836713fae5fd7626ef1dbfe813c66f4da8308b26b4cd0bd977471834d49512690afa39 SHA512 386668fd338ee24677c51379c69a73b6a749bd4cf72bf59f9cb800b1ac19938275d64d0c23e431c80ed5e572d86d94bbb030241c43cbf541801cdc672f5911c1 |
25 |
DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249 |
26 |
DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc |
27 |
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 |
28 |
DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 |
29 |
DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 |
30 |
-DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f |
31 |
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 |
32 |
|
33 |
diff --git a/sys-libs/libcxx/libcxx-12.0.1_rc4.ebuild b/sys-libs/libcxx/libcxx-12.0.1_rc4.ebuild |
34 |
deleted file mode 100644 |
35 |
index 40445a9324a..00000000000 |
36 |
--- a/sys-libs/libcxx/libcxx-12.0.1_rc4.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,212 +0,0 @@ |
39 |
-# Copyright 1999-2021 Gentoo Authors |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=7 |
43 |
- |
44 |
-CMAKE_ECLASS=cmake |
45 |
-PYTHON_COMPAT=( python3_{8..10} ) |
46 |
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs |
47 |
- |
48 |
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
49 |
-HOMEPAGE="https://libcxx.llvm.org/" |
50 |
- |
51 |
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
52 |
-SLOT="0" |
53 |
-KEYWORDS="" |
54 |
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test" |
55 |
-REQUIRED_USE="libunwind? ( libcxxabi )" |
56 |
-RESTRICT="!test? ( test )" |
57 |
- |
58 |
-RDEPEND=" |
59 |
- libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) |
60 |
- !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )" |
61 |
-# llvm-6 for new lit options |
62 |
-# clang-3.9.0 installs necessary target symlinks unconditionally |
63 |
-# which removes the need for MULTILIB_USEDEP |
64 |
-DEPEND="${RDEPEND} |
65 |
- >=sys-devel/llvm-6" |
66 |
-BDEPEND=" |
67 |
- test? ( |
68 |
- >=dev-util/cmake-3.16 |
69 |
- >=sys-devel/clang-3.9.0 |
70 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
71 |
- )" |
72 |
- |
73 |
-DOCS=( CREDITS.TXT ) |
74 |
- |
75 |
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) |
76 |
-LLVM_PATCHSET=12.0.1-rc4-1 |
77 |
-llvm.org_set_globals |
78 |
- |
79 |
-python_check_deps() { |
80 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
81 |
-} |
82 |
- |
83 |
-pkg_setup() { |
84 |
- # Darwin Prefix builds do not have llvm installed yet, so rely on |
85 |
- # bootstrap-prefix to set the appropriate path vars to LLVM instead |
86 |
- # of using llvm_pkg_setup. |
87 |
- if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
88 |
- llvm_pkg_setup |
89 |
- fi |
90 |
- use test && python-any-r1_pkg_setup |
91 |
- |
92 |
- if ! use libcxxabi && ! tc-is-gcc ; then |
93 |
- eerror "To build ${PN} against libsupc++, you have to use gcc. Other" |
94 |
- eerror "compilers are not supported. Please set CC=gcc and CXX=g++" |
95 |
- eerror "and try again." |
96 |
- die |
97 |
- fi |
98 |
-} |
99 |
- |
100 |
-test_compiler() { |
101 |
- $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
102 |
- <<<'int main() { return 0; }' &>/dev/null |
103 |
-} |
104 |
- |
105 |
-src_configure() { |
106 |
- # note: we need to do this before multilib kicks in since it will |
107 |
- # alter the CHOST |
108 |
- local cxxabi cxxabi_incs |
109 |
- if use libcxxabi; then |
110 |
- cxxabi=libcxxabi |
111 |
- cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" |
112 |
- else |
113 |
- local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" |
114 |
- cxxabi=libsupc++ |
115 |
- cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
116 |
- fi |
117 |
- |
118 |
- multilib-minimal_src_configure |
119 |
-} |
120 |
- |
121 |
-multilib_src_configure() { |
122 |
- # we want -lgcc_s for unwinder, and for compiler runtime when using |
123 |
- # gcc, clang with gcc runtime (or any unknown compiler) |
124 |
- local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF |
125 |
- if use libunwind; then |
126 |
- # work-around missing -lunwind upstream |
127 |
- extra_libs+=( -lunwind ) |
128 |
- # if we're using libunwind and clang with compiler-rt, we want |
129 |
- # to link to compiler-rt instead of -lgcc_s |
130 |
- if tc-is-clang; then |
131 |
- local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
132 |
- ${LDFLAGS} -print-libgcc-file-name) |
133 |
- if [[ ${compiler_rt} == *libclang_rt* ]]; then |
134 |
- want_gcc_s=OFF |
135 |
- want_compiler_rt=ON |
136 |
- extra_libs+=( "${compiler_rt}" ) |
137 |
- fi |
138 |
- fi |
139 |
- elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then |
140 |
- # clang-based darwin prefix disables libunwind useflag during |
141 |
- # bootstrap, because libunwind is not in the prefix yet. |
142 |
- # override the default, though, because clang based libcxx |
143 |
- # should never use gcc_s on Darwin. |
144 |
- want_gcc_s=OFF |
145 |
- # compiler_rt is not available in EPREFIX during bootstrap, |
146 |
- # so we cannot link to it yet anyway, so keep the defaults |
147 |
- # of want_compiler_rt=OFF and extra_libs=() |
148 |
- fi |
149 |
- |
150 |
- # bootstrap: cmake is unhappy if compiler can't link to stdlib |
151 |
- local nolib_flags=( -nodefaultlibs -lc ) |
152 |
- if ! test_compiler; then |
153 |
- if test_compiler "${nolib_flags[@]}"; then |
154 |
- local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
155 |
- ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" |
156 |
- fi |
157 |
- fi |
158 |
- |
159 |
- local libdir=$(get_libdir) |
160 |
- local mycmakeargs=( |
161 |
- -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} |
162 |
- -DLIBCXX_ENABLE_SHARED=ON |
163 |
- -DLIBCXX_ENABLE_STATIC=$(usex static-libs) |
164 |
- -DLIBCXX_CXX_ABI=${cxxabi} |
165 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} |
166 |
- # we're using our own mechanism for generating linker scripts |
167 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
168 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
169 |
- -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
170 |
- -DLIBCXX_INCLUDE_TESTS=$(usex test) |
171 |
- -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
172 |
- -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
173 |
- -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
174 |
- ) |
175 |
- |
176 |
- if use test; then |
177 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
178 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
179 |
- |
180 |
- mycmakeargs+=( |
181 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
182 |
- -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
183 |
- -DPython3_EXECUTABLE="${PYTHON}" |
184 |
- ) |
185 |
- fi |
186 |
- cmake_src_configure |
187 |
-} |
188 |
- |
189 |
-multilib_src_test() { |
190 |
- local -x LIT_PRESERVES_TMP=1 |
191 |
- cmake_build check-cxx |
192 |
-} |
193 |
- |
194 |
-# Usage: deps |
195 |
-gen_ldscript() { |
196 |
- local output_format |
197 |
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
198 |
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
199 |
- |
200 |
- cat <<-END_LDSCRIPT |
201 |
-/* GNU ld script |
202 |
- Include missing dependencies |
203 |
-*/ |
204 |
-${output_format} |
205 |
-GROUP ( $@ ) |
206 |
-END_LDSCRIPT |
207 |
-} |
208 |
- |
209 |
-gen_static_ldscript() { |
210 |
- local libdir=$(get_libdir) |
211 |
- local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a") |
212 |
- |
213 |
- # Move it first. |
214 |
- mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die |
215 |
- # Generate libc++.a ldscript for inclusion of its dependencies so that |
216 |
- # clang++ -stdlib=libc++ -static works out of the box. |
217 |
- local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" |
218 |
- # On Linux/glibc it does not link without libpthread or libdl. It is |
219 |
- # fine on FreeBSD. |
220 |
- use elibc_glibc && deps+=" libpthread.a libdl.a" |
221 |
- |
222 |
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die |
223 |
-} |
224 |
- |
225 |
-gen_shared_ldscript() { |
226 |
- local libdir=$(get_libdir) |
227 |
- # libsupc++ doesn't have a shared version |
228 |
- local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a") |
229 |
- |
230 |
- mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die |
231 |
- local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" |
232 |
- |
233 |
- gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die |
234 |
-} |
235 |
- |
236 |
-multilib_src_install() { |
237 |
- cmake_src_install |
238 |
- if [[ ${CHOST} != *-darwin* ]] ; then |
239 |
- gen_shared_ldscript |
240 |
- use static-libs && gen_static_ldscript |
241 |
- fi |
242 |
-} |
243 |
- |
244 |
-pkg_postinst() { |
245 |
- elog "This package (${PN}) is mainly intended as a replacement for the C++" |
246 |
- elog "standard library when using clang." |
247 |
- elog "To use it, instead of libstdc++, use:" |
248 |
- elog " clang++ -stdlib=libc++" |
249 |
- elog "to compile your C++ programs." |
250 |
-} |