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