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