commit:     857499eaa307fdceaf611547b45f3f8039edb2db
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 15:20:50 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 18:37:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857499ea

sys-devel/clang: Bump to 10.0.1-rc2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-devel/clang/Manifest                |   1 +
 sys-devel/clang/clang-10.0.1_rc2.ebuild | 412 ++++++++++++++++++++++++++++++++
 2 files changed, 413 insertions(+)

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 2c327068f14..a64a0b278aa 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -6,4 +6,5 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 
4319c837b36111401e3b0f9659b8d875c894
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B 
eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d
 SHA512 
64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 
6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191
 SHA512 
baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 
64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06
 SHA512 
f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B 
d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf
 SHA512 
8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B 
b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f
 SHA512 
fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59

diff --git a/sys-devel/clang/clang-10.0.1_rc2.ebuild 
b/sys-devel/clang/clang-10.0.1_rc2.ebuild
new file mode 100644
index 00000000000..ec222215357
--- /dev/null
+++ b/sys-devel/clang/clang-10.0.1_rc2.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+       python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/";
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+       llvm/lib/Testing/Support
+       llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+       NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+       "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
+       test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+       || ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// 
/,},${MULTILIB_USEDEP}]
+       static-analyzer? ( dev-lang/perl:* )
+       xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+       ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       dev-python/sphinx
+       xml? ( virtual/pkgconfig )
+       ${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+       !<sys-devel/llvm-4.0.0_rc:0
+       !sys-devel/clang:0"
+PDEPEND="
+       sys-devel/clang-common
+       ~sys-devel/clang-runtime-${PV}
+       default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+       default-libcxx? ( >=sys-libs/libcxx-${PV} )"
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+PATCHES=(
+       # fix simultaneous linking to .a and dylib
+       
"${FILESDIR}"/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch
+       
"${FILESDIR}"/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch
+)
+
+pkg_setup() {
+       LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+       python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       # create extra parent dir for relative CLANG_RESOURCE_DIR access
+       mkdir -p x/y || die
+       BUILD_DIR=${WORKDIR}/x/y/clang
+
+       llvm.org_src_prepare
+
+       mv ../clang-tools-extra tools/extra || die
+}
+
+check_distribution_components() {
+       if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+               local all_targets=() my_targets=() l
+               cd "${BUILD_DIR}" || die
+
+               while read -r l; do
+                       if [[ ${l} == install-*-stripped:* ]]; then
+                               l=${l#install-}
+                               l=${l%%-stripped*}
+
+                               case ${l} in
+                                       # meta-targets
+                                       clang-libraries|distribution)
+                                               continue
+                                               ;;
+                                       # tools
+                                       clang|clangd|clang-*)
+                                               ;;
+                                       # static libraries
+                                       clang*|findAllSymbols)
+                                               continue
+                                               ;;
+                                       # headers for clang-tidy static library
+                                       clang-tidy-headers)
+                                               continue
+                                               ;;
+                                       # conditional to USE=doc
+                                       docs-clang-html|docs-clang-tools-html)
+                                               continue
+                                               ;;
+                               esac
+
+                               all_targets+=( "${l}" )
+                       fi
+               done < <(ninja -t targets all)
+
+               while read -r l; do
+                       my_targets+=( "${l}" )
+               done < <(get_distribution_components $"\n")
+
+               local add=() remove=()
+               for l in "${all_targets[@]}"; do
+                       if ! has "${l}" "${my_targets[@]}"; then
+                               add+=( "${l}" )
+                       fi
+               done
+               for l in "${my_targets[@]}"; do
+                       if ! has "${l}" "${all_targets[@]}"; then
+                               remove+=( "${l}" )
+                       fi
+               done
+
+               if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+                       eqawarn "get_distribution_components() is outdated!"
+                       eqawarn "   Add: ${add[*]}"
+                       eqawarn "Remove: ${remove[*]}"
+               fi
+               cd - >/dev/null || die
+       fi
+}
+
+get_distribution_components() {
+       local sep=${1-;}
+
+       local out=(
+               # common stuff
+               clang-cmake-exports
+               clang-headers
+               clang-resource-headers
+               libclang-headers
+
+               # libs
+               clang-cpp
+               libclang
+       )
+
+       if multilib_is_native_abi; then
+               out+=(
+                       # common stuff
+                       bash-autocomplete
+                       libclang-python-bindings
+
+                       # tools
+                       c-index-test
+                       clang
+                       clang-format
+                       clang-import-test
+                       clang-offload-bundler
+                       clang-offload-wrapper
+                       clang-refactor
+                       clang-rename
+                       clang-scan-deps
+                       diagtool
+                       hmaptool
+
+                       # extra tools
+                       clang-apply-replacements
+                       clang-change-namespace
+                       clang-doc
+                       clang-include-fixer
+                       clang-move
+                       clang-query
+                       clang-reorder-fields
+                       clang-tidy
+                       clangd
+                       find-all-symbols
+                       modularize
+                       pp-trace
+
+                       # manpages
+                       docs-clang-man
+                       docs-clang-tools-man
+               )
+
+               use doc && out+=(
+                       docs-clang-html
+                       docs-clang-tools-html
+               )
+
+               use static-analyzer && out+=(
+                       clang-check
+                       clang-extdef-mapping
+                       scan-build
+                       scan-view
+               )
+       fi
+
+       printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+       local llvm_version=$(llvm-config --version) || die
+       local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+       local mycmakeargs=(
+               
-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+               
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+               # relative to bindir
+               -DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+               -DBUILD_SHARED_LIBS=OFF
+               -DCLANG_LINK_CLANG_DYLIB=ON
+               -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+               -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+               -DLLVM_BUILD_TESTS=$(usex test)
+
+               # these are not propagated reliably, so redefine them
+               -DLLVM_ENABLE_EH=ON
+               -DLLVM_ENABLE_RTTI=ON
+
+               -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+               # libgomp support fails to find headers without explicit -I
+               # furthermore, it provides only syntax checking
+               -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+               # override default stdlib and rtlib
+               -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+               -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+
+               -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+               -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+       )
+       use test && mycmakeargs+=(
+               -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+               -DLLVM_LIT_ARGS="$(get_lit_flags)"
+       )
+
+       if multilib_is_native_abi; then
+               mycmakeargs+=(
+                       # normally copied from LLVM_INCLUDE_DOCS but the latter
+                       # is lacking value in stand-alone builds
+                       -DCLANG_INCLUDE_DOCS=ON
+                       -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON
+                       -DLLVM_BUILD_DOCS=ON
+                       -DLLVM_ENABLE_SPHINX=ON
+                       
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+                       
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+                       -DSPHINX_WARNINGS_AS_ERRORS=OFF
+               )
+       else
+               mycmakeargs+=(
+                       -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+               )
+       fi
+
+       if [[ -n ${EPREFIX} ]]; then
+               mycmakeargs+=(
+                       -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+               )
+       fi
+
+       if tc-is-cross-compiler; then
+               [[ -x "/usr/bin/clang-tblgen" ]] \
+                       || die "/usr/bin/clang-tblgen not found or usable"
+               mycmakeargs+=(
+                       -DCMAKE_CROSSCOMPILING=ON
+                       -DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+               )
+       fi
+
+       # LLVM can have very high memory consumption while linking,
+       # exhausting the limit on 32-bit linker executable
+       use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+       cmake_src_configure
+
+       multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+       cmake_src_compile
+
+       # provide a symlink for tests
+       if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+               mkdir -p "${WORKDIR}"/lib || die
+               ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang 
|| die
+       fi
+}
+
+multilib_src_test() {
+       # respect TMPDIR!
+       local -x LIT_PRESERVES_TMP=1
+       cmake_build check-clang
+       multilib_is_native_abi &&
+               cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+       MULTILIB_WRAPPED_HEADERS=(
+               /usr/include/clang/Config/config.h
+       )
+
+       multilib-minimal_src_install
+
+       # Move runtime headers to /usr/lib/clang, where they belong
+       mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+       # move (remaining) wrapped headers back
+       mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+       # Apply CHOST and version suffix to clang tools
+       # note: we use two version components here (vs 3 in runtime path)
+       local llvm_version=$(llvm-config --version) || die
+       local clang_version=$(ver_cut 1 "${llvm_version}")
+       local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+       local clang_tools=( clang clang++ clang-cl clang-cpp )
+       local abi i
+
+       # cmake gives us:
+       # - clang-X
+       # - clang -> clang-X
+       # - clang++, clang-cl, clang-cpp -> clang
+       # we want to have:
+       # - clang-X
+       # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+       # - clang, clang++, clang-cl, clang-cpp -> clang*-X
+       # also in CHOST variant
+       for i in "${clang_tools[@]:1}"; do
+               rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+               dosym "clang-${clang_version}" 
"/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+               dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+       done
+
+       # now create target symlinks for all supported ABIs
+       for abi in $(get_all_abis); do
+               local abi_chost=$(get_abi_CHOST "${abi}")
+               for i in "${clang_tools[@]}"; do
+                       dosym "${i}-${clang_version}" \
+                               
"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+                       dosym "${abi_chost}-${i}-${clang_version}" \
+                               "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+               done
+       done
+
+       # Remove unnecessary headers on FreeBSD, bug #417171
+       if use kernel_FreeBSD; then
+               rm 
"${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h
 || die
+       fi
+}
+
+multilib_src_install() {
+       DESTDIR=${D} cmake_build install-distribution
+
+       # move headers to /usr/include for wrapping & ABI mismatch checks
+       # (also drop the version suffix from runtime headers)
+       rm -rf "${ED}"/usr/include || die
+       mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+       mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang 
"${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+       python_fix_shebang "${ED}"
+       if use static-analyzer; then
+               python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+       fi
+
+       docompress "/usr/lib/llvm/${SLOT}/share/man"
+       # match 'html' non-compression
+       use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+       # +x for some reason; TODO: investigate
+       use static-analyzer && fperms a-x 
"/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+               eselect compiler-shadow update all
+       fi
+
+       elog "You can find additional utility scripts in:"
+       elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+       elog "Some of them are vim integration scripts (with instructions 
inside)."
+       elog "The run-clang-tidy.py script requires the following additional 
package:"
+       elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+               eselect compiler-shadow clean all
+       fi
+}

Reply via email to