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, 26 Sep 2022 07:36:23
Message-Id: 1664177758.d505bcc473935480b3d6b926bd6164308bffea10.mgorny@gentoo
1 commit: d505bcc473935480b3d6b926bd6164308bffea10
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 26 06:48:54 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 26 07:35:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d505bcc4
7
8 sys-libs/libcxx: Bump to 16.0.0_pre20220926
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_pre20220926.ebuild | 219 +++++++++++++++++++++++
14 2 files changed, 220 insertions(+)
15
16 diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
17 index 853521d69088..21859d67a73b 100644
18 --- a/sys-libs/libcxx/Manifest
19 +++ b/sys-libs/libcxx/Manifest
20 @@ -5,4 +5,5 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
21 DIST llvm-project-15.0.1.src.tar.xz 112068688 BLAKE2B 8fd6690445f7cbc8b47a7c1dd1f2c4fbc39f9a97f9d4a0015d466726454b090b0d1ff9b0d926eba7065e84782901687f74e6540a36dc6656a93f3c92c7bc7e06 SHA512 cef84bc173118a30db3ece5e5c6f874bf689c77afc40a4792fdcb7556555ac14a8e6de1dc811755405e5d162d63bc69abaecba30d220a42765160d69f0073fda
22 DIST llvm-project-15.0.1.src.tar.xz.sig 438 BLAKE2B d8f634adab531bb19178fb27bc83b3a90c856e9402dd5af700f9af43813f68d20c21b9112dd95e9f6f10609ee51ed5aaf77edb96ca16fb93136b8aea432affd3 SHA512 cbf2570840d8dc12f6436c495a23cf9d439ee195755c01a6d1d5bcc20133599dc956dc43a0f5016698e3c9a960826f5f3c2840a73f993467e275856a67999fda
23 DIST llvm-project-303526ef3aa211c1930be2885deae15eeeda3b18.tar.gz 167503164 BLAKE2B 143c72c58517b3e40ee74c1a0df47bfd0d0f9e71926bc8c39a007e674a08df95d0ffe05f523f97e4409b248349e13719cabbc7ac6938feebe702959e84a07243 SHA512 9aa5c86de6c6be1d26c085eb29ea283429e41330e937e5fdbd545bb3f5b996ac82cd6268701fcbbd202e89ee35f2b67e595fc595bb7383778e9ad5fd52ca10a0
24 +DIST llvm-project-4f188ef89ce5a3bee21fd0b4e8fcdf7f030f64b2.tar.gz 168720595 BLAKE2B 10bd3ac4eea674fc171f17414f6892a681529b020a5d513e075920f7792fb31d6d4a3584679ebea24bc839c2a233459b935d368c7ea57c94ad27c7c81da05cff SHA512 77ae7eb57c8c50affb516581dabe3b31e342f7ed899440521b6738aeec3b6e795c50c078bbe0f483a070961c9b5b73a7bbe28e2f109e2ce69d238ddbda8e134f
25 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
26
27 diff --git a/sys-libs/libcxx/libcxx-16.0.0_pre20220926.ebuild b/sys-libs/libcxx/libcxx-16.0.0_pre20220926.ebuild
28 new file mode 100644
29 index 000000000000..28c4cca66346
30 --- /dev/null
31 +++ b/sys-libs/libcxx/libcxx-16.0.0_pre20220926.ebuild
32 @@ -0,0 +1,219 @@
33 +# Copyright 1999-2022 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +
38 +PYTHON_COMPAT=( python3_{8..11} )
39 +inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
40 + 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="+clang +libcxxabi static-libs test"
49 +REQUIRED_USE="test? ( clang )"
50 +RESTRICT="!test? ( test )"
51 +
52 +RDEPEND="
53 + libcxxabi? (
54 + ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
55 + )
56 + !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
57 +"
58 +LLVM_MAX_SLOT=${PV%%.*}
59 +DEPEND="
60 + ${RDEPEND}
61 + sys-devel/llvm:${LLVM_MAX_SLOT}
62 +"
63 +BDEPEND="
64 + clang? (
65 + sys-devel/clang:${LLVM_MAX_SLOT}
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_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 against compiler-rt instead of libgcc if this is what clang does
131 + local want_compiler_rt=OFF
132 + if tc-is-clang; then
133 + local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
134 + ${LDFLAGS} -print-libgcc-file-name)
135 + if [[ ${compiler_rt} == *libclang_rt* ]]; then
136 + want_compiler_rt=ON
137 + fi
138 + fi
139 +
140 + # bootstrap: cmake is unhappy if compiler can't link to stdlib
141 + local nolib_flags=( -nodefaultlibs -lc )
142 + if ! test_compiler; then
143 + if test_compiler "${nolib_flags[@]}"; then
144 + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
145 + ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
146 + fi
147 + fi
148 +
149 + local libdir=$(get_libdir)
150 + local mycmakeargs=(
151 + -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
152 + -DPython3_EXECUTABLE="${PYTHON}"
153 + -DLLVM_ENABLE_RUNTIMES=libcxx
154 + -DLLVM_INCLUDE_TESTS=OFF
155 + -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
156 +
157 + -DLIBCXX_ENABLE_SHARED=ON
158 + -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
159 + -DLIBCXX_CXX_ABI=${cxxabi}
160 + -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
161 + # we're using our own mechanism for generating linker scripts
162 + -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
163 + -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
164 + -DLIBCXX_INCLUDE_BENCHMARKS=OFF
165 + -DLIBCXX_INCLUDE_TESTS=$(usex test)
166 + -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
167 + )
168 +
169 + if use test; then
170 + mycmakeargs+=(
171 + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
172 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
173 + -DPython3_EXECUTABLE="${PYTHON}"
174 + )
175 + fi
176 + cmake_src_configure
177 +}
178 +
179 +multilib_src_compile() {
180 + cmake_src_compile
181 + if [[ ${CHOST} != *-darwin* ]] ; then
182 + gen_shared_ldscript
183 + use static-libs && gen_static_ldscript
184 + fi
185 +}
186 +
187 +multilib_src_test() {
188 + local -x LIT_PRESERVES_TMP=1
189 + cmake_build check-cxx
190 +}
191 +
192 +multilib_src_install() {
193 + cmake_src_install
194 + # since we've replaced libc++.{a,so} with ldscripts, now we have to
195 + # install the extra symlinks
196 + if [[ ${CHOST} != *-darwin* ]] ; then
197 + dolib.so lib/libc++_shared.so
198 + use static-libs && dolib.a lib/libc++_static.a
199 + fi
200 +}
201 +
202 +# Usage: deps
203 +gen_ldscript() {
204 + local output_format
205 + output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
206 + [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
207 +
208 + cat <<-END_LDSCRIPT
209 +/* GNU ld script
210 + Include missing dependencies
211 +*/
212 +${output_format}
213 +GROUP ( $@ )
214 +END_LDSCRIPT
215 +}
216 +
217 +gen_static_ldscript() {
218 + # Move it first.
219 + mv lib/libc++{,_static}.a || die
220 + # Generate libc++.a ldscript for inclusion of its dependencies so that
221 + # clang++ -stdlib=libc++ -static works out of the box.
222 + local deps=(
223 + libc++_static.a
224 + $(usex libcxxabi libc++abi.a libsupc++.a)
225 + )
226 + # On Linux/glibc it does not link without libpthread or libdl. It is
227 + # fine on FreeBSD.
228 + use elibc_glibc && deps+=( libpthread.a libdl.a )
229 +
230 + gen_ldscript "${deps[*]}" > lib/libc++.a || die
231 +}
232 +
233 +gen_shared_ldscript() {
234 + # Move it first.
235 + mv lib/libc++{,_shared}.so || die
236 + local deps=(
237 + libc++_shared.so
238 + # libsupc++ doesn't have a shared version
239 + $(usex libcxxabi libc++abi.so libsupc++.a)
240 + )
241 +
242 + gen_ldscript "${deps[*]}" > lib/libc++.so || die
243 +}
244 +
245 +pkg_postinst() {
246 + elog "This package (${PN}) is mainly intended as a replacement for the C++"
247 + elog "standard library when using clang."
248 + elog "To use it, instead of libstdc++, use:"
249 + elog " clang++ -stdlib=libc++"
250 + elog "to compile your C++ programs."
251 +}