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