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