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, 26 Nov 2022 11:04:06
Message-Id: 1669460633.1c37fd4c25fd27fcab5bf05a913037c33eae0a81.mgorny@gentoo
1 commit: 1c37fd4c25fd27fcab5bf05a913037c33eae0a81
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 26 06:35:58 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 11:03:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c37fd4c
7
8 sys-libs/libcxx: Add 16.0.0_pre20221126 snapshot
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxx/Manifest | 1 +
13 sys-libs/libcxx/libcxx-16.0.0_pre20221126.ebuild | 204 +++++++++++++++++++++++
14 2 files changed, 205 insertions(+)
15
16 diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
17 index 2558d68a4a3d..8f9498229faf 100644
18 --- a/sys-libs/libcxx/Manifest
19 +++ b/sys-libs/libcxx/Manifest
20 @@ -9,5 +9,6 @@ DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f
21 DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6
22 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
23 DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8
24 +DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
25 DIST llvm-project-f6f1fd443f48f417de9dfe23353055f1b20d87ef.tar.gz 170625743 BLAKE2B 3add45d7e2f26659f9602b5ccc034033610921ebeb2d6d69d6f5a3d1e3af224d3f5fd42e411d1fe0d5f8249c2ad995d41a236a87eba5a72ea9b20c112faa4c2f SHA512 2b57132d156f3d6d96802f617fff3eec0df6a3b5077ddcc4f31c87829e617f3065074d80e9d26c8c1c64322e76a09321fdfc8ae1d7a84f5da9f8606125e3b635
26 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
27
28 diff --git a/sys-libs/libcxx/libcxx-16.0.0_pre20221126.ebuild b/sys-libs/libcxx/libcxx-16.0.0_pre20221126.ebuild
29 new file mode 100644
30 index 000000000000..9b9bd5a335cb
31 --- /dev/null
32 +++ b/sys-libs/libcxx/libcxx-16.0.0_pre20221126.ebuild
33 @@ -0,0 +1,204 @@
34 +# Copyright 1999-2022 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=8
38 +
39 +PYTHON_COMPAT=( python3_{8..11} )
40 +inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
41 + toolchain-funcs
42 +
43 +DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
44 +HOMEPAGE="https://libcxx.llvm.org/"
45 +
46 +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
47 +SLOT="0"
48 +KEYWORDS=""
49 +IUSE="+clang +libcxxabi static-libs test"
50 +REQUIRED_USE="test? ( clang )"
51 +RESTRICT="!test? ( test )"
52 +
53 +RDEPEND="
54 + libcxxabi? (
55 + ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
56 + )
57 + !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
58 +"
59 +DEPEND="
60 + ${RDEPEND}
61 + sys-devel/llvm:${LLVM_MAJOR}
62 +"
63 +BDEPEND="
64 + clang? (
65 + sys-devel/clang:${LLVM_MAJOR}
66 + )
67 + !test? (
68 + ${PYTHON_DEPS}
69 + )
70 + test? (
71 + >=dev-util/cmake-3.16
72 + sys-devel/gdb[python]
73 + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
74 + )
75 +"
76 +
77 +LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
78 +llvm.org_set_globals
79 +
80 +python_check_deps() {
81 + use test || return 0
82 + python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
83 +}
84 +
85 +pkg_setup() {
86 + # Darwin Prefix builds do not have llvm installed yet, so rely on
87 + # bootstrap-prefix to set the appropriate path vars to LLVM instead
88 + # of using llvm_pkg_setup.
89 + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
90 + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
91 + fi
92 + python-any-r1_pkg_setup
93 +
94 + if ! use libcxxabi && ! tc-is-gcc ; then
95 + eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
96 + eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
97 + eerror "and try again."
98 + die
99 + fi
100 +}
101 +
102 +test_compiler() {
103 + $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
104 + <<<'int main() { return 0; }' &>/dev/null
105 +}
106 +
107 +src_configure() {
108 + # note: we need to do this before multilib kicks in since it will
109 + # alter the CHOST
110 + local cxxabi cxxabi_incs
111 + if use libcxxabi; then
112 + cxxabi=system-libcxxabi
113 + cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
114 + else
115 + local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
116 + cxxabi=libsupc++
117 + cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
118 + fi
119 +
120 + multilib-minimal_src_configure
121 +}
122 +
123 +multilib_src_configure() {
124 + if use clang; then
125 + local -x CC=${CHOST}-clang
126 + local -x CXX=${CHOST}-clang++
127 + strip-unsupported-flags
128 + fi
129 +
130 + # link to compiler-rt
131 + local use_compiler_rt=OFF
132 + [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
133 +
134 + # bootstrap: cmake is unhappy if compiler can't link to stdlib
135 + local nolib_flags=( -nodefaultlibs -lc )
136 + if ! test_compiler; then
137 + if test_compiler "${nolib_flags[@]}"; then
138 + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
139 + ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
140 + fi
141 + fi
142 +
143 + local libdir=$(get_libdir)
144 + local mycmakeargs=(
145 + -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
146 + -DPython3_EXECUTABLE="${PYTHON}"
147 + -DLLVM_ENABLE_RUNTIMES=libcxx
148 + -DLLVM_INCLUDE_TESTS=OFF
149 + -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
150 +
151 + -DLIBCXX_ENABLE_SHARED=ON
152 + -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
153 + -DLIBCXX_CXX_ABI=${cxxabi}
154 + -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
155 + # we're using our own mechanism for generating linker scripts
156 + -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
157 + -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
158 + -DLIBCXX_INCLUDE_BENCHMARKS=OFF
159 + -DLIBCXX_INCLUDE_TESTS=$(usex test)
160 + -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
161 + )
162 +
163 + if use test; then
164 + mycmakeargs+=(
165 + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
166 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
167 + -DPython3_EXECUTABLE="${PYTHON}"
168 + )
169 + fi
170 + cmake_src_configure
171 +}
172 +
173 +multilib_src_compile() {
174 + cmake_src_compile
175 + if [[ ${CHOST} != *-darwin* ]] ; then
176 + gen_shared_ldscript
177 + use static-libs && gen_static_ldscript
178 + fi
179 +}
180 +
181 +multilib_src_test() {
182 + local -x LIT_PRESERVES_TMP=1
183 + cmake_build check-cxx
184 +}
185 +
186 +multilib_src_install() {
187 + cmake_src_install
188 + # since we've replaced libc++.{a,so} with ldscripts, now we have to
189 + # install the extra symlinks
190 + if [[ ${CHOST} != *-darwin* ]] ; then
191 + dolib.so lib/libc++_shared.so
192 + use static-libs && dolib.a lib/libc++_static.a
193 + fi
194 +}
195 +
196 +# Usage: deps
197 +gen_ldscript() {
198 + local output_format
199 + output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
200 + [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
201 +
202 + cat <<-END_LDSCRIPT
203 +/* GNU ld script
204 + Include missing dependencies
205 +*/
206 +${output_format}
207 +GROUP ( $@ )
208 +END_LDSCRIPT
209 +}
210 +
211 +gen_static_ldscript() {
212 + # Move it first.
213 + mv lib/libc++{,_static}.a || die
214 + # Generate libc++.a ldscript for inclusion of its dependencies so that
215 + # clang++ -stdlib=libc++ -static works out of the box.
216 + local deps=(
217 + libc++_static.a
218 + $(usex libcxxabi libc++abi.a libsupc++.a)
219 + )
220 + # On Linux/glibc it does not link without libpthread or libdl. It is
221 + # fine on FreeBSD.
222 + use elibc_glibc && deps+=( libpthread.a libdl.a )
223 +
224 + gen_ldscript "${deps[*]}" > lib/libc++.a || die
225 +}
226 +
227 +gen_shared_ldscript() {
228 + # Move it first.
229 + mv lib/libc++{,_shared}.so || die
230 + local deps=(
231 + libc++_shared.so
232 + # libsupc++ doesn't have a shared version
233 + $(usex libcxxabi libc++abi.so libsupc++.a)
234 + )
235 +
236 + gen_ldscript "${deps[*]}" > lib/libc++.so || die
237 +}