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-devel/clang/
Date: Mon, 29 Jun 2020 18:37:48
Message-Id: 1593455849.857499eaa307fdceaf611547b45f3f8039edb2db.mgorny@gentoo
1 commit: 857499eaa307fdceaf611547b45f3f8039edb2db
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 29 15:20:50 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 29 18:37:29 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857499ea
7
8 sys-devel/clang: Bump to 10.0.1-rc2
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/clang/Manifest | 1 +
13 sys-devel/clang/clang-10.0.1_rc2.ebuild | 412 ++++++++++++++++++++++++++++++++
14 2 files changed, 413 insertions(+)
15
16 diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
17 index 2c327068f14..a64a0b278aa 100644
18 --- a/sys-devel/clang/Manifest
19 +++ b/sys-devel/clang/Manifest
20 @@ -6,4 +6,5 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
21 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
22 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
23 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
24 +DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
25 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
26
27 diff --git a/sys-devel/clang/clang-10.0.1_rc2.ebuild b/sys-devel/clang/clang-10.0.1_rc2.ebuild
28 new file mode 100644
29 index 00000000000..ec222215357
30 --- /dev/null
31 +++ b/sys-devel/clang/clang-10.0.1_rc2.ebuild
32 @@ -0,0 +1,412 @@
33 +# Copyright 1999-2020 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +PYTHON_COMPAT=( python3_{6..9} )
39 +inherit cmake llvm llvm.org multilib-minimal pax-utils \
40 + python-single-r1 toolchain-funcs
41 +
42 +DESCRIPTION="C language family frontend for LLVM"
43 +HOMEPAGE="https://llvm.org/"
44 +LLVM_COMPONENTS=( clang clang-tools-extra )
45 +LLVM_TEST_COMPONENTS=(
46 + llvm/lib/Testing/Support
47 + llvm/utils/{lit,llvm-lit,unittest}
48 +)
49 +llvm.org_set_globals
50 +
51 +# Keep in sync with sys-devel/llvm
52 +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
53 +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
54 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
55 + "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
56 +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
57 +LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
58 +
59 +# MSVCSetupApi.h: MIT
60 +# sorttable.js: MIT
61 +
62 +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
63 +SLOT="$(ver_cut 1)"
64 +KEYWORDS=""
65 +IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
66 + test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
67 +REQUIRED_USE="${PYTHON_REQUIRED_USE}
68 + || ( ${ALL_LLVM_TARGETS[*]} )"
69 +RESTRICT="!test? ( test )"
70 +
71 +RDEPEND="
72 + ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
73 + static-analyzer? ( dev-lang/perl:* )
74 + xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
75 + ${PYTHON_DEPS}"
76 +DEPEND="${RDEPEND}"
77 +BDEPEND="
78 + dev-python/sphinx
79 + xml? ( virtual/pkgconfig )
80 + ${PYTHON_DEPS}"
81 +RDEPEND="${RDEPEND}
82 + !<sys-devel/llvm-4.0.0_rc:0
83 + !sys-devel/clang:0"
84 +PDEPEND="
85 + sys-devel/clang-common
86 + ~sys-devel/clang-runtime-${PV}
87 + default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
88 + default-libcxx? ( >=sys-libs/libcxx-${PV} )"
89 +
90 +# Multilib notes:
91 +# 1. ABI_* flags control ABIs libclang* is built for only.
92 +# 2. clang is always capable of compiling code for all ABIs for enabled
93 +# target. However, you will need appropriate crt* files (installed
94 +# e.g. by sys-devel/gcc and sys-libs/glibc).
95 +# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
96 +# in the current profile (i.e. alike supported by sys-devel/gcc).
97 +#
98 +# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
99 +# multilib clang* libraries (not runtime, not wrappers).
100 +
101 +PATCHES=(
102 + # fix simultaneous linking to .a and dylib
103 + "${FILESDIR}"/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch
104 + "${FILESDIR}"/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch
105 +)
106 +
107 +pkg_setup() {
108 + LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
109 + python-single-r1_pkg_setup
110 +}
111 +
112 +src_prepare() {
113 + # create extra parent dir for relative CLANG_RESOURCE_DIR access
114 + mkdir -p x/y || die
115 + BUILD_DIR=${WORKDIR}/x/y/clang
116 +
117 + llvm.org_src_prepare
118 +
119 + mv ../clang-tools-extra tools/extra || die
120 +}
121 +
122 +check_distribution_components() {
123 + if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
124 + local all_targets=() my_targets=() l
125 + cd "${BUILD_DIR}" || die
126 +
127 + while read -r l; do
128 + if [[ ${l} == install-*-stripped:* ]]; then
129 + l=${l#install-}
130 + l=${l%%-stripped*}
131 +
132 + case ${l} in
133 + # meta-targets
134 + clang-libraries|distribution)
135 + continue
136 + ;;
137 + # tools
138 + clang|clangd|clang-*)
139 + ;;
140 + # static libraries
141 + clang*|findAllSymbols)
142 + continue
143 + ;;
144 + # headers for clang-tidy static library
145 + clang-tidy-headers)
146 + continue
147 + ;;
148 + # conditional to USE=doc
149 + docs-clang-html|docs-clang-tools-html)
150 + continue
151 + ;;
152 + esac
153 +
154 + all_targets+=( "${l}" )
155 + fi
156 + done < <(ninja -t targets all)
157 +
158 + while read -r l; do
159 + my_targets+=( "${l}" )
160 + done < <(get_distribution_components $"\n")
161 +
162 + local add=() remove=()
163 + for l in "${all_targets[@]}"; do
164 + if ! has "${l}" "${my_targets[@]}"; then
165 + add+=( "${l}" )
166 + fi
167 + done
168 + for l in "${my_targets[@]}"; do
169 + if ! has "${l}" "${all_targets[@]}"; then
170 + remove+=( "${l}" )
171 + fi
172 + done
173 +
174 + if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
175 + eqawarn "get_distribution_components() is outdated!"
176 + eqawarn " Add: ${add[*]}"
177 + eqawarn "Remove: ${remove[*]}"
178 + fi
179 + cd - >/dev/null || die
180 + fi
181 +}
182 +
183 +get_distribution_components() {
184 + local sep=${1-;}
185 +
186 + local out=(
187 + # common stuff
188 + clang-cmake-exports
189 + clang-headers
190 + clang-resource-headers
191 + libclang-headers
192 +
193 + # libs
194 + clang-cpp
195 + libclang
196 + )
197 +
198 + if multilib_is_native_abi; then
199 + out+=(
200 + # common stuff
201 + bash-autocomplete
202 + libclang-python-bindings
203 +
204 + # tools
205 + c-index-test
206 + clang
207 + clang-format
208 + clang-import-test
209 + clang-offload-bundler
210 + clang-offload-wrapper
211 + clang-refactor
212 + clang-rename
213 + clang-scan-deps
214 + diagtool
215 + hmaptool
216 +
217 + # extra tools
218 + clang-apply-replacements
219 + clang-change-namespace
220 + clang-doc
221 + clang-include-fixer
222 + clang-move
223 + clang-query
224 + clang-reorder-fields
225 + clang-tidy
226 + clangd
227 + find-all-symbols
228 + modularize
229 + pp-trace
230 +
231 + # manpages
232 + docs-clang-man
233 + docs-clang-tools-man
234 + )
235 +
236 + use doc && out+=(
237 + docs-clang-html
238 + docs-clang-tools-html
239 + )
240 +
241 + use static-analyzer && out+=(
242 + clang-check
243 + clang-extdef-mapping
244 + scan-build
245 + scan-view
246 + )
247 + fi
248 +
249 + printf "%s${sep}" "${out[@]}"
250 +}
251 +
252 +multilib_src_configure() {
253 + local llvm_version=$(llvm-config --version) || die
254 + local clang_version=$(ver_cut 1-3 "${llvm_version}")
255 +
256 + local mycmakeargs=(
257 + -DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
258 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
259 + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
260 + # relative to bindir
261 + -DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
262 +
263 + -DBUILD_SHARED_LIBS=OFF
264 + -DCLANG_LINK_CLANG_DYLIB=ON
265 + -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
266 +
267 + -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
268 + -DLLVM_BUILD_TESTS=$(usex test)
269 +
270 + # these are not propagated reliably, so redefine them
271 + -DLLVM_ENABLE_EH=ON
272 + -DLLVM_ENABLE_RTTI=ON
273 +
274 + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
275 + # libgomp support fails to find headers without explicit -I
276 + # furthermore, it provides only syntax checking
277 + -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
278 +
279 + # override default stdlib and rtlib
280 + -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
281 + -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
282 +
283 + -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
284 + -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
285 + )
286 + use test && mycmakeargs+=(
287 + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
288 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
289 + )
290 +
291 + if multilib_is_native_abi; then
292 + mycmakeargs+=(
293 + # normally copied from LLVM_INCLUDE_DOCS but the latter
294 + # is lacking value in stand-alone builds
295 + -DCLANG_INCLUDE_DOCS=ON
296 + -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON
297 + -DLLVM_BUILD_DOCS=ON
298 + -DLLVM_ENABLE_SPHINX=ON
299 + -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
300 + -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
301 + -DSPHINX_WARNINGS_AS_ERRORS=OFF
302 + )
303 + else
304 + mycmakeargs+=(
305 + -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
306 + )
307 + fi
308 +
309 + if [[ -n ${EPREFIX} ]]; then
310 + mycmakeargs+=(
311 + -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
312 + )
313 + fi
314 +
315 + if tc-is-cross-compiler; then
316 + [[ -x "/usr/bin/clang-tblgen" ]] \
317 + || die "/usr/bin/clang-tblgen not found or usable"
318 + mycmakeargs+=(
319 + -DCMAKE_CROSSCOMPILING=ON
320 + -DCLANG_TABLEGEN=/usr/bin/clang-tblgen
321 + )
322 + fi
323 +
324 + # LLVM can have very high memory consumption while linking,
325 + # exhausting the limit on 32-bit linker executable
326 + use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
327 +
328 + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
329 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
330 + cmake_src_configure
331 +
332 + multilib_is_native_abi && check_distribution_components
333 +}
334 +
335 +multilib_src_compile() {
336 + cmake_src_compile
337 +
338 + # provide a symlink for tests
339 + if [[ ! -L ${WORKDIR}/lib/clang ]]; then
340 + mkdir -p "${WORKDIR}"/lib || die
341 + ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
342 + fi
343 +}
344 +
345 +multilib_src_test() {
346 + # respect TMPDIR!
347 + local -x LIT_PRESERVES_TMP=1
348 + cmake_build check-clang
349 + multilib_is_native_abi &&
350 + cmake_build check-clang-tools check-clangd
351 +}
352 +
353 +src_install() {
354 + MULTILIB_WRAPPED_HEADERS=(
355 + /usr/include/clang/Config/config.h
356 + )
357 +
358 + multilib-minimal_src_install
359 +
360 + # Move runtime headers to /usr/lib/clang, where they belong
361 + mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
362 + # move (remaining) wrapped headers back
363 + mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
364 +
365 + # Apply CHOST and version suffix to clang tools
366 + # note: we use two version components here (vs 3 in runtime path)
367 + local llvm_version=$(llvm-config --version) || die
368 + local clang_version=$(ver_cut 1 "${llvm_version}")
369 + local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
370 + local clang_tools=( clang clang++ clang-cl clang-cpp )
371 + local abi i
372 +
373 + # cmake gives us:
374 + # - clang-X
375 + # - clang -> clang-X
376 + # - clang++, clang-cl, clang-cpp -> clang
377 + # we want to have:
378 + # - clang-X
379 + # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
380 + # - clang, clang++, clang-cl, clang-cpp -> clang*-X
381 + # also in CHOST variant
382 + for i in "${clang_tools[@]:1}"; do
383 + rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
384 + dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
385 + dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
386 + done
387 +
388 + # now create target symlinks for all supported ABIs
389 + for abi in $(get_all_abis); do
390 + local abi_chost=$(get_abi_CHOST "${abi}")
391 + for i in "${clang_tools[@]}"; do
392 + dosym "${i}-${clang_version}" \
393 + "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
394 + dosym "${abi_chost}-${i}-${clang_version}" \
395 + "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
396 + done
397 + done
398 +
399 + # Remove unnecessary headers on FreeBSD, bug #417171
400 + if use kernel_FreeBSD; then
401 + rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
402 + fi
403 +}
404 +
405 +multilib_src_install() {
406 + DESTDIR=${D} cmake_build install-distribution
407 +
408 + # move headers to /usr/include for wrapping & ABI mismatch checks
409 + # (also drop the version suffix from runtime headers)
410 + rm -rf "${ED}"/usr/include || die
411 + mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
412 + mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
413 +}
414 +
415 +multilib_src_install_all() {
416 + python_fix_shebang "${ED}"
417 + if use static-analyzer; then
418 + python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
419 + fi
420 +
421 + docompress "/usr/lib/llvm/${SLOT}/share/man"
422 + # match 'html' non-compression
423 + use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
424 + # +x for some reason; TODO: investigate
425 + use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
426 +}
427 +
428 +pkg_postinst() {
429 + if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
430 + eselect compiler-shadow update all
431 + fi
432 +
433 + elog "You can find additional utility scripts in:"
434 + elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
435 + elog "Some of them are vim integration scripts (with instructions inside)."
436 + elog "The run-clang-tidy.py script requires the following additional package:"
437 + elog " dev-python/pyyaml"
438 +}
439 +
440 +pkg_postrm() {
441 + if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
442 + eselect compiler-shadow clean all
443 + fi
444 +}