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: Thu, 28 Jan 2021 10:58:32
Message-Id: 1611831496.4fa34d4e10cf773fb5bcafb5fb7ff22756992710.mgorny@gentoo
1 commit: 4fa34d4e10cf773fb5bcafb5fb7ff22756992710
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 28 10:32:55 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 28 10:58:16 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa34d4e
7
8 sys-libs/libcxx: Bump to 12.0.0-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-12.0.0_rc1.ebuild | 218 +++++++++++++++++++++++++++++++
14 2 files changed, 219 insertions(+)
15
16 diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
17 index 207853f3401..b71e21ccaaa 100644
18 --- a/sys-libs/libcxx/Manifest
19 +++ b/sys-libs/libcxx/Manifest
20 @@ -3,4 +3,5 @@ DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc
21 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
22 DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
23 DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
24 +DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
25 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
26
27 diff --git a/sys-libs/libcxx/libcxx-12.0.0_rc1.ebuild b/sys-libs/libcxx/libcxx-12.0.0_rc1.ebuild
28 new file mode 100644
29 index 00000000000..6bfe1aa438b
30 --- /dev/null
31 +++ b/sys-libs/libcxx/libcxx-12.0.0_rc1.ebuild
32 @@ -0,0 +1,218 @@
33 +# Copyright 1999-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +CMAKE_ECLASS=cmake
39 +PYTHON_COMPAT=( python3_{6..9} )
40 +inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
41 +
42 +DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
43 +HOMEPAGE="https://libcxx.llvm.org/"
44 +
45 +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
46 +SLOT="0"
47 +KEYWORDS=""
48 +IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
49 +REQUIRED_USE="libunwind? ( libcxxabi )"
50 +RESTRICT="!test? ( test )"
51 +
52 +RDEPEND="
53 + libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
54 + !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
55 +# llvm-6 for new lit options
56 +# clang-3.9.0 installs necessary target symlinks unconditionally
57 +# which removes the need for MULTILIB_USEDEP
58 +DEPEND="${RDEPEND}
59 + >=sys-devel/llvm-6"
60 +BDEPEND="
61 + test? (
62 + >=dev-util/cmake-3.16
63 + >=sys-devel/clang-3.9.0
64 + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
65 + )"
66 +
67 +DOCS=( CREDITS.TXT )
68 +
69 +LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
70 +llvm.org_set_globals
71 +
72 +python_check_deps() {
73 + has_version "dev-python/lit[${PYTHON_USEDEP}]"
74 +}
75 +
76 +pkg_setup() {
77 + # Darwin Prefix builds do not have llvm installed yet, so rely on
78 + # bootstrap-prefix to set the appropriate path vars to LLVM instead
79 + # of using llvm_pkg_setup.
80 + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
81 + llvm_pkg_setup
82 + fi
83 + use test && python-any-r1_pkg_setup
84 +
85 + if ! use libcxxabi && ! tc-is-gcc ; then
86 + eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
87 + eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
88 + eerror "and try again."
89 + die
90 + fi
91 +}
92 +
93 +src_prepare() {
94 + # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
95 + # out-of-tree build.
96 + eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
97 +
98 + llvm.org_src_prepare
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 + -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
174 + )
175 +
176 + if use test; then
177 + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
178 + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
179 +
180 + mycmakeargs+=(
181 + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
182 + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
183 + -DPython3_EXECUTABLE="${PYTHON}"
184 + )
185 + fi
186 + cmake_src_configure
187 +}
188 +
189 +multilib_src_test() {
190 + local -x LIT_PRESERVES_TMP=1
191 + cmake_build check-cxx
192 +}
193 +
194 +# Usage: deps
195 +gen_ldscript() {
196 + local output_format
197 + output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
198 + [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
199 +
200 + cat <<-END_LDSCRIPT
201 +/* GNU ld script
202 + Include missing dependencies
203 +*/
204 +${output_format}
205 +GROUP ( $@ )
206 +END_LDSCRIPT
207 +}
208 +
209 +gen_static_ldscript() {
210 + local libdir=$(get_libdir)
211 + local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
212 +
213 + # Move it first.
214 + mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
215 + # Generate libc++.a ldscript for inclusion of its dependencies so that
216 + # clang++ -stdlib=libc++ -static works out of the box.
217 + local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
218 + # On Linux/glibc it does not link without libpthread or libdl. It is
219 + # fine on FreeBSD.
220 + use elibc_glibc && deps+=" libpthread.a libdl.a"
221 +
222 + gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
223 +}
224 +
225 +gen_shared_ldscript() {
226 + local libdir=$(get_libdir)
227 + # libsupc++ doesn't have a shared version
228 + local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
229 +
230 + mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
231 + local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
232 +
233 + gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
234 +}
235 +
236 +multilib_src_install() {
237 + cmake_src_install
238 + if [[ ${CHOST} != *-darwin* ]] ; then
239 + gen_shared_ldscript
240 + use static-libs && gen_static_ldscript
241 + fi
242 +}
243 +
244 +pkg_postinst() {
245 + elog "This package (${PN}) is mainly intended as a replacement for the C++"
246 + elog "standard library when using clang."
247 + elog "To use it, instead of libstdc++, use:"
248 + elog " clang++ -stdlib=libc++"
249 + elog "to compile your C++ programs."
250 +}