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/libcxx/
Date: Wed, 02 Feb 2022 21:16:40
Message-Id: 1643836576.ba60778470c54145531a1c6343283b8463c3a34a.mgorny@gentoo
1 commit: ba60778470c54145531a1c6343283b8463c3a34a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 2 16:45:06 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 2 21:16:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba607784
7
8 sys-libs/libcxx: Remove 13.0.1_rc3
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxx/Manifest | 2 -
13 sys-libs/libcxx/libcxx-13.0.1_rc3.ebuild | 215 -------------------------------
14 2 files changed, 217 deletions(-)
15
16 diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
17 index 2d1107159d7e..37ef36710d84 100644
18 --- a/sys-libs/libcxx/Manifest
19 +++ b/sys-libs/libcxx/Manifest
20 @@ -1,11 +1,9 @@
21 DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
22 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
23 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
24 -DIST llvm-gentoo-patchset-13.0.1-rc3.tar.xz 4808 BLAKE2B d8ed3ae424914437413e2e8c029880072e93d79ca79b842ad59451df46594c9b0d73ee5d49d3b65c4c7a40c86b2e0d43501ef106aea7c481f22425a5245a3411 SHA512 10430a720b120a340a681fa435a7f050741c75270607e3f5214bf829313d274c11f019f1ac072857dc5d7f868e6eb013932d1c94446e8cb2e151ac818a081914
25 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
26 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
27 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
28 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
29 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
30 -DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
31 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
32
33 diff --git a/sys-libs/libcxx/libcxx-13.0.1_rc3.ebuild b/sys-libs/libcxx/libcxx-13.0.1_rc3.ebuild
34 deleted file mode 100644
35 index 212ed836bbba..000000000000
36 --- a/sys-libs/libcxx/libcxx-13.0.1_rc3.ebuild
37 +++ /dev/null
38 @@ -1,215 +0,0 @@
39 -# Copyright 1999-2022 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="+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 - sys-devel/gdb[python]
71 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
72 - )"
73 -
74 -DOCS=( CREDITS.TXT )
75 -
76 -LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake,utils/llvm-lit} )
77 -LLVM_PATCHSET=${PV/_/-}
78 -llvm.org_set_globals
79 -
80 -python_check_deps() {
81 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
82 -}
83 -
84 -pkg_setup() {
85 - # Darwin Prefix builds do not have llvm installed yet, so rely on
86 - # bootstrap-prefix to set the appropriate path vars to LLVM instead
87 - # of using llvm_pkg_setup.
88 - if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
89 - llvm_pkg_setup
90 - fi
91 - use test && python-any-r1_pkg_setup
92 -
93 - if ! use libcxxabi && ! tc-is-gcc ; then
94 - eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
95 - eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
96 - eerror "and try again."
97 - die
98 - fi
99 -}
100 -
101 -test_compiler() {
102 - $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
103 - <<<'int main() { return 0; }' &>/dev/null
104 -}
105 -
106 -src_configure() {
107 - # note: we need to do this before multilib kicks in since it will
108 - # alter the CHOST
109 - local cxxabi cxxabi_incs
110 - if use libcxxabi; then
111 - cxxabi=libcxxabi
112 - cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
113 - else
114 - local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
115 - cxxabi=libsupc++
116 - cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
117 - fi
118 -
119 - multilib-minimal_src_configure
120 -}
121 -
122 -multilib_src_configure() {
123 - # we want -lgcc_s for unwinder, and for compiler runtime when using
124 - # gcc, clang with gcc runtime (or any unknown compiler)
125 - local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
126 - if use libunwind; then
127 - # work-around missing -lunwind upstream
128 - extra_libs+=( -lunwind )
129 - # if we're using libunwind and clang with compiler-rt, we want
130 - # to link to compiler-rt instead of -lgcc_s
131 - if tc-is-clang; then
132 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
133 - ${LDFLAGS} -print-libgcc-file-name)
134 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
135 - want_gcc_s=OFF
136 - want_compiler_rt=ON
137 - extra_libs+=( "${compiler_rt}" )
138 - fi
139 - fi
140 - elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
141 - # clang-based darwin prefix disables libunwind useflag during
142 - # bootstrap, because libunwind is not in the prefix yet.
143 - # override the default, though, because clang based libcxx
144 - # should never use gcc_s on Darwin.
145 - want_gcc_s=OFF
146 - # compiler_rt is not available in EPREFIX during bootstrap,
147 - # so we cannot link to it yet anyway, so keep the defaults
148 - # of want_compiler_rt=OFF and extra_libs=()
149 - fi
150 -
151 - # bootstrap: cmake is unhappy if compiler can't link to stdlib
152 - local nolib_flags=( -nodefaultlibs -lc )
153 - if ! test_compiler; then
154 - if test_compiler "${nolib_flags[@]}"; then
155 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
156 - ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
157 - fi
158 - fi
159 -
160 - local libdir=$(get_libdir)
161 - local mycmakeargs=(
162 - -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
163 - -DLIBCXX_ENABLE_SHARED=ON
164 - -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
165 - -DLIBCXX_CXX_ABI=${cxxabi}
166 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
167 - # we're using our own mechanism for generating linker scripts
168 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
169 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
170 - -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
171 - -DLIBCXX_INCLUDE_TESTS=$(usex test)
172 - -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
173 - -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
174 - -DLIBCXX_TARGET_TRIPLE="${CHOST}"
175 - -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
176 - )
177 -
178 - if use test; then
179 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
180 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
181 -
182 - mycmakeargs+=(
183 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
184 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
185 - -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
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 -}