1 |
commit: 4ce09c028d9159ba3a1573eccff1a384c7ece918 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 9 15:26:18 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 9 15:28:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce09c02 |
7 |
|
8 |
sys-libs/libcxx: Bump to 11.1.0-rc3 |
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.1.0_rc3.ebuild | 218 +++++++++++++++++++++++++++++++ |
14 |
2 files changed, 219 insertions(+) |
15 |
|
16 |
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest |
17 |
index b71e21ccaaa..757ab90ea8c 100644 |
18 |
--- a/sys-libs/libcxx/Manifest |
19 |
+++ b/sys-libs/libcxx/Manifest |
20 |
@@ -3,5 +3,6 @@ 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-11.1.0-rc3.tar.gz 122785838 BLAKE2B d0998219471476be1a1249b3a2444750585a352047d4dc14de6fec87eb3407d0f4b848757340200d3423cb4090554ae033fb4ec3797446e46556fbb566bb77a3 SHA512 b67874cb127f3f929a3796558cdfbf509b384c4247f4936ba08cecf88ca880a167cf67c23d78104b5bab4a98efd9435d1b923deb7ae7367875414e6c896957d1 |
25 |
DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a |
26 |
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 |
27 |
|
28 |
diff --git a/sys-libs/libcxx/libcxx-11.1.0_rc3.ebuild b/sys-libs/libcxx/libcxx-11.1.0_rc3.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..8ed99383fe0 |
31 |
--- /dev/null |
32 |
+++ b/sys-libs/libcxx/libcxx-11.1.0_rc3.ebuild |
33 |
@@ -0,0 +1,218 @@ |
34 |
+# Copyright 1999-2021 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+ |
39 |
+CMAKE_ECLASS=cmake |
40 |
+PYTHON_COMPAT=( python3_{7..9} ) |
41 |
+inherit cmake-multilib llvm llvm.org python-any-r1 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="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? ( |
63 |
+ >=dev-util/cmake-3.16 |
64 |
+ >=sys-devel/clang-3.9.0 |
65 |
+ $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
66 |
+ )" |
67 |
+ |
68 |
+DOCS=( CREDITS.TXT ) |
69 |
+ |
70 |
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) |
71 |
+llvm.org_set_globals |
72 |
+ |
73 |
+python_check_deps() { |
74 |
+ has_version "dev-python/lit[${PYTHON_USEDEP}]" |
75 |
+} |
76 |
+ |
77 |
+pkg_setup() { |
78 |
+ # Darwin Prefix builds do not have llvm installed yet, so rely on |
79 |
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead |
80 |
+ # of using llvm_pkg_setup. |
81 |
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
82 |
+ llvm_pkg_setup |
83 |
+ fi |
84 |
+ use test && python-any-r1_pkg_setup |
85 |
+ |
86 |
+ if ! use libcxxabi && ! tc-is-gcc ; then |
87 |
+ eerror "To build ${PN} against libsupc++, you have to use gcc. Other" |
88 |
+ eerror "compilers are not supported. Please set CC=gcc and CXX=g++" |
89 |
+ eerror "and try again." |
90 |
+ die |
91 |
+ fi |
92 |
+} |
93 |
+ |
94 |
+src_prepare() { |
95 |
+ # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a |
96 |
+ # out-of-tree build. |
97 |
+ eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" |
98 |
+ |
99 |
+ llvm.org_src_prepare |
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=libcxxabi |
113 |
+ cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" |
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 |
+ # we want -lgcc_s for unwinder, and for compiler runtime when using |
125 |
+ # gcc, clang with gcc runtime (or any unknown compiler) |
126 |
+ local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF |
127 |
+ if use libunwind; then |
128 |
+ # work-around missing -lunwind upstream |
129 |
+ extra_libs+=( -lunwind ) |
130 |
+ # if we're using libunwind and clang with compiler-rt, we want |
131 |
+ # to link to compiler-rt instead of -lgcc_s |
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_gcc_s=OFF |
137 |
+ want_compiler_rt=ON |
138 |
+ extra_libs+=( "${compiler_rt}" ) |
139 |
+ fi |
140 |
+ fi |
141 |
+ elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then |
142 |
+ # clang-based darwin prefix disables libunwind useflag during |
143 |
+ # bootstrap, because libunwind is not in the prefix yet. |
144 |
+ # override the default, though, because clang based libcxx |
145 |
+ # should never use gcc_s on Darwin. |
146 |
+ want_gcc_s=OFF |
147 |
+ # compiler_rt is not available in EPREFIX during bootstrap, |
148 |
+ # so we cannot link to it yet anyway, so keep the defaults |
149 |
+ # of want_compiler_rt=OFF and extra_libs=() |
150 |
+ fi |
151 |
+ |
152 |
+ # bootstrap: cmake is unhappy if compiler can't link to stdlib |
153 |
+ local nolib_flags=( -nodefaultlibs -lc ) |
154 |
+ if ! test_compiler; then |
155 |
+ if test_compiler "${nolib_flags[@]}"; then |
156 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
157 |
+ ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" |
158 |
+ fi |
159 |
+ fi |
160 |
+ |
161 |
+ local libdir=$(get_libdir) |
162 |
+ local mycmakeargs=( |
163 |
+ -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} |
164 |
+ -DLIBCXX_ENABLE_SHARED=ON |
165 |
+ -DLIBCXX_ENABLE_STATIC=$(usex static-libs) |
166 |
+ -DLIBCXX_CXX_ABI=${cxxabi} |
167 |
+ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} |
168 |
+ # we're using our own mechanism for generating linker scripts |
169 |
+ -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
170 |
+ -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
171 |
+ -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
172 |
+ -DLIBCXX_INCLUDE_TESTS=$(usex test) |
173 |
+ -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
174 |
+ -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
175 |
+ ) |
176 |
+ |
177 |
+ if use test; then |
178 |
+ local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
179 |
+ [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
180 |
+ |
181 |
+ mycmakeargs+=( |
182 |
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
183 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
184 |
+ -DPython3_EXECUTABLE="${PYTHON}" |
185 |
+ ) |
186 |
+ fi |
187 |
+ cmake_src_configure |
188 |
+} |
189 |
+ |
190 |
+multilib_src_test() { |
191 |
+ local -x LIT_PRESERVES_TMP=1 |
192 |
+ cmake_build check-cxx |
193 |
+} |
194 |
+ |
195 |
+# Usage: deps |
196 |
+gen_ldscript() { |
197 |
+ local output_format |
198 |
+ output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
199 |
+ [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
200 |
+ |
201 |
+ cat <<-END_LDSCRIPT |
202 |
+/* GNU ld script |
203 |
+ Include missing dependencies |
204 |
+*/ |
205 |
+${output_format} |
206 |
+GROUP ( $@ ) |
207 |
+END_LDSCRIPT |
208 |
+} |
209 |
+ |
210 |
+gen_static_ldscript() { |
211 |
+ local libdir=$(get_libdir) |
212 |
+ local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a") |
213 |
+ |
214 |
+ # Move it first. |
215 |
+ mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die |
216 |
+ # Generate libc++.a ldscript for inclusion of its dependencies so that |
217 |
+ # clang++ -stdlib=libc++ -static works out of the box. |
218 |
+ local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" |
219 |
+ # On Linux/glibc it does not link without libpthread or libdl. It is |
220 |
+ # fine on FreeBSD. |
221 |
+ use elibc_glibc && deps+=" libpthread.a libdl.a" |
222 |
+ |
223 |
+ gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die |
224 |
+} |
225 |
+ |
226 |
+gen_shared_ldscript() { |
227 |
+ local libdir=$(get_libdir) |
228 |
+ # libsupc++ doesn't have a shared version |
229 |
+ local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a") |
230 |
+ |
231 |
+ mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die |
232 |
+ local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" |
233 |
+ |
234 |
+ gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die |
235 |
+} |
236 |
+ |
237 |
+multilib_src_install() { |
238 |
+ cmake_src_install |
239 |
+ if [[ ${CHOST} != *-darwin* ]] ; then |
240 |
+ gen_shared_ldscript |
241 |
+ use static-libs && gen_static_ldscript |
242 |
+ fi |
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 |
+} |