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