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: Sat, 11 Sep 2021 07:24:22
Message-Id: 1631344649.709c675e98f169c0393cb0608a6be7d326dbbba4.mgorny@gentoo
1 commit: 709c675e98f169c0393cb0608a6be7d326dbbba4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 11 07:17:08 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 11 07:17:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709c675e
7
8 sys-libs/libcxx: Remove 12.0.0
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.0.ebuild | 221 -----------------------------------
14 2 files changed, 223 deletions(-)
15
16 diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
17 index 695175197b3..c24e85c1763 100644
18 --- a/sys-libs/libcxx/Manifest
19 +++ b/sys-libs/libcxx/Manifest
20 @@ -1,12 +1,10 @@
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.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
25 DIST llvm-gentoo-patchset-13.0.0-rc2.tar.xz 5556 BLAKE2B e6c7ecfe8f842edc4d4f30a20c66973519182ecb46e21fb20b6c5fcb6d54cdef830fcb120a405b77f1332e3557acbbbbfa99170b20d17f137e0a63b2d0dc1258 SHA512 ddeaf1d07f0ba893ce93e5fe1eff1c0716769a7879fc503c397f4db7becb363f94747f59b6d53c204df73a93954fb0ca5aae6ad544ce55c964c4bf441a410cd2
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.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
31 DIST llvmorg-13.0.0-rc1.tar.gz 147235597 BLAKE2B 089fed119dee8a16f278cebb13808bd5a95629cc87ebee3050225cc041b78fee51acacc5bcc913d4a99e830bfe5774b19a04a845293c5087dd2a8c9d94d2fde9 SHA512 6e307e2c2dcb7ff41d11ee29d69f41c0ef55f200999847a3a924a2e773fc9c2160015746789af8b723c628bd232f97fce63370209bd0065491d80b0cc0017e85
32 DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
33
34 diff --git a/sys-libs/libcxx/libcxx-12.0.0.ebuild b/sys-libs/libcxx/libcxx-12.0.0.ebuild
35 deleted file mode 100644
36 index 3463d022a19..00000000000
37 --- a/sys-libs/libcxx/libcxx-12.0.0.ebuild
38 +++ /dev/null
39 @@ -1,221 +0,0 @@
40 -# Copyright 1999-2021 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=7
44 -
45 -CMAKE_ECLASS=cmake
46 -PYTHON_COMPAT=( python3_{7..9} )
47 -inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
48 -
49 -DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
50 -HOMEPAGE="https://libcxx.llvm.org/"
51 -
52 -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
53 -SLOT="0"
54 -KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
55 -IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
56 -REQUIRED_USE="libunwind? ( libcxxabi )"
57 -RESTRICT="!test? ( test )"
58 -
59 -RDEPEND="
60 - libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
61 - !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
62 -# llvm-6 for new lit options
63 -# clang-3.9.0 installs necessary target symlinks unconditionally
64 -# which removes the need for MULTILIB_USEDEP
65 -DEPEND="${RDEPEND}
66 - >=sys-devel/llvm-6"
67 -BDEPEND="
68 - test? (
69 - >=dev-util/cmake-3.16
70 - >=sys-devel/clang-3.9.0
71 - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
72 - )"
73 -
74 -DOCS=( CREDITS.TXT )
75 -
76 -LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
77 -LLVM_PATCHSET=12.0.0-1
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 -src_prepare() {
102 - # Known failures.
103 - rm test/libcxx/gdb/gdb_pretty_printer_test.sh.cpp || die
104 - rm test/libcxx/memory/trivial_abi/unique_ptr_ret.pass.cpp || die
105 - rm test/libcxx/memory/trivial_abi/weak_ptr_ret.pass.cpp || die
106 -
107 - llvm.org_src_prepare
108 -}
109 -
110 -test_compiler() {
111 - $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
112 - <<<'int main() { return 0; }' &>/dev/null
113 -}
114 -
115 -src_configure() {
116 - # note: we need to do this before multilib kicks in since it will
117 - # alter the CHOST
118 - local cxxabi cxxabi_incs
119 - if use libcxxabi; then
120 - cxxabi=libcxxabi
121 - cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
122 - else
123 - local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
124 - cxxabi=libsupc++
125 - cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
126 - fi
127 -
128 - multilib-minimal_src_configure
129 -}
130 -
131 -multilib_src_configure() {
132 - # we want -lgcc_s for unwinder, and for compiler runtime when using
133 - # gcc, clang with gcc runtime (or any unknown compiler)
134 - local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
135 - if use libunwind; then
136 - # work-around missing -lunwind upstream
137 - extra_libs+=( -lunwind )
138 - # if we're using libunwind and clang with compiler-rt, we want
139 - # to link to compiler-rt instead of -lgcc_s
140 - if tc-is-clang; then
141 - local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
142 - ${LDFLAGS} -print-libgcc-file-name)
143 - if [[ ${compiler_rt} == *libclang_rt* ]]; then
144 - want_gcc_s=OFF
145 - want_compiler_rt=ON
146 - extra_libs+=( "${compiler_rt}" )
147 - fi
148 - fi
149 - elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
150 - # clang-based darwin prefix disables libunwind useflag during
151 - # bootstrap, because libunwind is not in the prefix yet.
152 - # override the default, though, because clang based libcxx
153 - # should never use gcc_s on Darwin.
154 - want_gcc_s=OFF
155 - # compiler_rt is not available in EPREFIX during bootstrap,
156 - # so we cannot link to it yet anyway, so keep the defaults
157 - # of want_compiler_rt=OFF and extra_libs=()
158 - fi
159 -
160 - # bootstrap: cmake is unhappy if compiler can't link to stdlib
161 - local nolib_flags=( -nodefaultlibs -lc )
162 - if ! test_compiler; then
163 - if test_compiler "${nolib_flags[@]}"; then
164 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
165 - ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
166 - fi
167 - fi
168 -
169 - local libdir=$(get_libdir)
170 - local mycmakeargs=(
171 - -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
172 - -DLIBCXX_ENABLE_SHARED=ON
173 - -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
174 - -DLIBCXX_CXX_ABI=${cxxabi}
175 - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
176 - # we're using our own mechanism for generating linker scripts
177 - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
178 - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
179 - -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
180 - -DLIBCXX_INCLUDE_TESTS=$(usex test)
181 - -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
182 - -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
183 - -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
184 - )
185 -
186 - if use test; then
187 - local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
188 - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
189 -
190 - mycmakeargs+=(
191 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
192 - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
193 - -DPython3_EXECUTABLE="${PYTHON}"
194 - )
195 - fi
196 - cmake_src_configure
197 -}
198 -
199 -multilib_src_test() {
200 - local -x LIT_PRESERVES_TMP=1
201 - cmake_build check-cxx
202 -}
203 -
204 -# Usage: deps
205 -gen_ldscript() {
206 - local output_format
207 - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
208 - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
209 -
210 - cat <<-END_LDSCRIPT
211 -/* GNU ld script
212 - Include missing dependencies
213 -*/
214 -${output_format}
215 -GROUP ( $@ )
216 -END_LDSCRIPT
217 -}
218 -
219 -gen_static_ldscript() {
220 - local libdir=$(get_libdir)
221 - local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
222 -
223 - # Move it first.
224 - mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
225 - # Generate libc++.a ldscript for inclusion of its dependencies so that
226 - # clang++ -stdlib=libc++ -static works out of the box.
227 - local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
228 - # On Linux/glibc it does not link without libpthread or libdl. It is
229 - # fine on FreeBSD.
230 - use elibc_glibc && deps+=" libpthread.a libdl.a"
231 -
232 - gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
233 -}
234 -
235 -gen_shared_ldscript() {
236 - local libdir=$(get_libdir)
237 - # libsupc++ doesn't have a shared version
238 - local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
239 -
240 - mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
241 - local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
242 -
243 - gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
244 -}
245 -
246 -multilib_src_install() {
247 - cmake_src_install
248 - if [[ ${CHOST} != *-darwin* ]] ; then
249 - gen_shared_ldscript
250 - use static-libs && gen_static_ldscript
251 - fi
252 -}
253 -
254 -pkg_postinst() {
255 - elog "This package (${PN}) is mainly intended as a replacement for the C++"
256 - elog "standard library when using clang."
257 - elog "To use it, instead of libstdc++, use:"
258 - elog " clang++ -stdlib=libc++"
259 - elog "to compile your C++ programs."
260 -}