1 |
commit: 69822ca0b2ba6b17c93e2224de95208e79b5acad |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 14 08:57:05 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 14 09:55:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69822ca0 |
7 |
|
8 |
sys-libs/libcxx: Bump to 9.0.1_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-9.0.1_rc3.ebuild | 211 ++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 212 insertions(+) |
15 |
|
16 |
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest |
17 |
index b9d29433c50..881541a3b7c 100644 |
18 |
--- a/sys-libs/libcxx/Manifest |
19 |
+++ b/sys-libs/libcxx/Manifest |
20 |
@@ -2,3 +2,4 @@ DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf9 |
21 |
DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e |
22 |
DIST libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e |
23 |
DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c |
24 |
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1 |
25 |
|
26 |
diff --git a/sys-libs/libcxx/libcxx-9.0.1_rc3.ebuild b/sys-libs/libcxx/libcxx-9.0.1_rc3.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..41c96a83d61 |
29 |
--- /dev/null |
30 |
+++ b/sys-libs/libcxx/libcxx-9.0.1_rc3.ebuild |
31 |
@@ -0,0 +1,211 @@ |
32 |
+# Copyright 1999-2019 Gentoo Authors |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=7 |
36 |
+ |
37 |
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
38 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \ |
39 |
+ toolchain-funcs |
40 |
+ |
41 |
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
42 |
+HOMEPAGE="https://libcxx.llvm.org/" |
43 |
+LLVM_COMPONENTS=( libcxx ) |
44 |
+llvm.org_set_globals |
45 |
+ |
46 |
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
49 |
+IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test" |
50 |
+REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) ) |
51 |
+ ?? ( libcxxabi libcxxrt )" |
52 |
+RESTRICT="!test? ( test )" |
53 |
+ |
54 |
+RDEPEND=" |
55 |
+ libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) |
56 |
+ libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) |
57 |
+ !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )" |
58 |
+# llvm-6 for new lit options |
59 |
+# clang-3.9.0 installs necessary target symlinks unconditionally |
60 |
+# which removes the need for MULTILIB_USEDEP |
61 |
+DEPEND="${RDEPEND} |
62 |
+ >=sys-devel/llvm-6" |
63 |
+BDEPEND=" |
64 |
+ test? ( >=sys-devel/clang-3.9.0 |
65 |
+ $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
66 |
+ |
67 |
+DOCS=( CREDITS.TXT ) |
68 |
+ |
69 |
+PATCHES=( |
70 |
+ # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a |
71 |
+ # out-of-tree build. |
72 |
+ "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" |
73 |
+) |
74 |
+ |
75 |
+# least intrusive of all |
76 |
+CMAKE_BUILD_TYPE=RelWithDebInfo |
77 |
+ |
78 |
+python_check_deps() { |
79 |
+ has_version "dev-python/lit[${PYTHON_USEDEP}]" |
80 |
+} |
81 |
+ |
82 |
+pkg_setup() { |
83 |
+ llvm_pkg_setup |
84 |
+ use test && python-any-r1_pkg_setup |
85 |
+ |
86 |
+ if ! use libcxxabi && ! use libcxxrt && ! 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 |
+ if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then |
93 |
+ eerror "${PN} needs to be built with gcc-4.7 or later (or other" |
94 |
+ eerror "conformant compilers). Please use gcc-config to switch to" |
95 |
+ eerror "gcc-4.7 or later version." |
96 |
+ die |
97 |
+ fi |
98 |
+} |
99 |
+ |
100 |
+test_compiler() { |
101 |
+ $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
102 |
+ <<<'int main() { return 0; }' &>/dev/null |
103 |
+} |
104 |
+ |
105 |
+src_configure() { |
106 |
+ # note: we need to do this before multilib kicks in since it will |
107 |
+ # alter the CHOST |
108 |
+ local cxxabi cxxabi_incs |
109 |
+ if use libcxxabi; then |
110 |
+ cxxabi=libcxxabi |
111 |
+ cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" |
112 |
+ elif use libcxxrt; then |
113 |
+ cxxabi=libcxxrt |
114 |
+ cxxabi_incs="${EPREFIX}/usr/include/libcxxrt" |
115 |
+ else |
116 |
+ local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" |
117 |
+ cxxabi=libsupc++ |
118 |
+ cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
119 |
+ fi |
120 |
+ |
121 |
+ multilib-minimal_src_configure |
122 |
+} |
123 |
+ |
124 |
+multilib_src_configure() { |
125 |
+ # we want -lgcc_s for unwinder, and for compiler runtime when using |
126 |
+ # gcc, clang with gcc runtime (or any unknown compiler) |
127 |
+ local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF |
128 |
+ if use libunwind; then |
129 |
+ # work-around missing -lunwind upstream |
130 |
+ extra_libs+=( -lunwind ) |
131 |
+ # if we're using libunwind and clang with compiler-rt, we want |
132 |
+ # to link to compiler-rt instead of -lgcc_s |
133 |
+ if tc-is-clang; then |
134 |
+ local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
135 |
+ ${LDFLAGS} -print-libgcc-file-name) |
136 |
+ if [[ ${compiler_rt} == *libclang_rt* ]]; then |
137 |
+ want_gcc_s=OFF |
138 |
+ want_compiler_rt=ON |
139 |
+ extra_libs+=( "${compiler_rt}" ) |
140 |
+ fi |
141 |
+ fi |
142 |
+ fi |
143 |
+ |
144 |
+ # bootstrap: cmake is unhappy if compiler can't link to stdlib |
145 |
+ local nolib_flags=( -nodefaultlibs -lc ) |
146 |
+ if ! test_compiler; then |
147 |
+ if test_compiler "${nolib_flags[@]}"; then |
148 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
149 |
+ ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" |
150 |
+ fi |
151 |
+ fi |
152 |
+ |
153 |
+ local libdir=$(get_libdir) |
154 |
+ local mycmakeargs=( |
155 |
+ -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} |
156 |
+ -DLIBCXX_ENABLE_SHARED=ON |
157 |
+ -DLIBCXX_ENABLE_STATIC=$(usex static-libs) |
158 |
+ -DLIBCXX_CXX_ABI=${cxxabi} |
159 |
+ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} |
160 |
+ # we're using our own mechanism for generating linker scripts |
161 |
+ -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
162 |
+ -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
163 |
+ -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
164 |
+ -DLIBCXX_INCLUDE_TESTS=$(usex test) |
165 |
+ -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
166 |
+ -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
167 |
+ ) |
168 |
+ |
169 |
+ if use test; then |
170 |
+ local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
171 |
+ local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")} |
172 |
+ |
173 |
+ [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
174 |
+ |
175 |
+ mycmakeargs+=( |
176 |
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
177 |
+ -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" |
178 |
+ ) |
179 |
+ fi |
180 |
+ cmake-utils_src_configure |
181 |
+} |
182 |
+ |
183 |
+multilib_src_test() { |
184 |
+ local -x LIT_PRESERVES_TMP=1 |
185 |
+ cmake-utils_src_make check-libcxx |
186 |
+} |
187 |
+ |
188 |
+# Usage: deps |
189 |
+gen_ldscript() { |
190 |
+ local output_format |
191 |
+ output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
192 |
+ [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
193 |
+ |
194 |
+ cat <<-END_LDSCRIPT |
195 |
+/* GNU ld script |
196 |
+ Include missing dependencies |
197 |
+*/ |
198 |
+${output_format} |
199 |
+GROUP ( $@ ) |
200 |
+END_LDSCRIPT |
201 |
+} |
202 |
+ |
203 |
+gen_static_ldscript() { |
204 |
+ local libdir=$(get_libdir) |
205 |
+ local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")") |
206 |
+ |
207 |
+ # Move it first. |
208 |
+ mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die |
209 |
+ # Generate libc++.a ldscript for inclusion of its dependencies so that |
210 |
+ # clang++ -stdlib=libc++ -static works out of the box. |
211 |
+ local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" |
212 |
+ # On Linux/glibc it does not link without libpthread or libdl. It is |
213 |
+ # fine on FreeBSD. |
214 |
+ use elibc_glibc && deps+=" libpthread.a libdl.a" |
215 |
+ |
216 |
+ gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die |
217 |
+} |
218 |
+ |
219 |
+gen_shared_ldscript() { |
220 |
+ local libdir=$(get_libdir) |
221 |
+ # libsupc++ doesn't have a shared version |
222 |
+ local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")") |
223 |
+ |
224 |
+ mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die |
225 |
+ local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" |
226 |
+ |
227 |
+ gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die |
228 |
+} |
229 |
+ |
230 |
+multilib_src_install() { |
231 |
+ cmake-utils_src_install |
232 |
+ gen_shared_ldscript |
233 |
+ use static-libs && gen_static_ldscript |
234 |
+} |
235 |
+ |
236 |
+pkg_postinst() { |
237 |
+ elog "This package (${PN}) is mainly intended as a replacement for the C++" |
238 |
+ elog "standard library when using clang." |
239 |
+ elog "To use it, instead of libstdc++, use:" |
240 |
+ elog " clang++ -stdlib=libc++" |
241 |
+ elog "to compile your C++ programs." |
242 |
+} |