commit:     02a87068f6636572e2b6181ce887a3cb8b4ba64c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 13 08:27:38 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 12:06:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a87068

sys-devel/clang: Bump to 13.0.1_rc2

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

 sys-devel/clang/Manifest                |   2 +
 sys-devel/clang/clang-13.0.1_rc2.ebuild | 422 ++++++++++++++++++++++++++++++++
 2 files changed, 424 insertions(+)

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index c54472589a88..501c66762de9 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -5,8 +5,10 @@ DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B 
e69138a422e315b31a3d9c11f
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 
963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9
 SHA512 
fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 
6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0
 SHA512 
7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6
 DIST llvm-gentoo-patchset-13.0.1-rc1-r1.tar.xz 6332 BLAKE2B 
2586125a75d46e14c897f99dec5cf3dbb431684abbad4678d2ccd17411c3934247034b85cf3b397569fcabc366f97afd19773cd199b6e48eb5e7fc61a7d0ea26
 SHA512 
acff9e94ea4e02cc16135797e821388c5159a73ee4be2bc437789f39bcd2cb8f31f4bc42fb561e26db548948304e743ea0fe8016f36689571ad70cc7065b0c34
+DIST llvm-gentoo-patchset-13.0.1-rc2.tar.xz 5192 BLAKE2B 
4a129a3d0b7c1839d79c814ea57602f5e87aadb9050fc8e91868d2c3773ff7ae8e2137f785deeded6925a4368220767526c95790c9883f2031edc3ebae25b13c
 SHA512 
2f384281d06f5378f7d1b2f036958c7db00d1c4d799406fd188fa8388f0cf18279dae36f2fb37bff26daa91419ab1bc1c2390be0f3af42359f1aef8de81b6ac8
 DIST llvm-gentoo-patchset-9999-2.tar.xz 4064 BLAKE2B 
4b29234f10ea4ab2609e83c71bcd5f968cd93abd275c13366146ca899bbc576d55a3364432cc7db353739f5da5762529436689b848857e839e230425d551265b
 SHA512 
c0d40a81bd11dc6018d7b3789e4ca7e1cd784992d44fab8d750b8b5281db39ad9092d320d125cae93164d2dddc42177a173b6d5e4158e4b62d7507db877acb9e
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B 
ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985
 SHA512 
9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B 
f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d
 SHA512 
6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 
628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822
 SHA512 
8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 
3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781
 SHA512 
d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
+DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 
86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a
 SHA512 
0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f

diff --git a/sys-devel/clang/clang-13.0.1_rc2.ebuild 
b/sys-devel/clang/clang-13.0.1_rc2.ebuild
new file mode 100644
index 000000000000..ae93802425a4
--- /dev/null
+++ b/sys-devel/clang/clang-13.0.1_rc2.ebuild
@@ -0,0 +1,422 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+       prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/";
+
+# 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 default-lld
+       doc llvm-libunwind +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+       static-analyzer? ( dev-lang/perl:* )
+       xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+       ${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+       >=dev-util/cmake-3.16
+       doc? ( dev-python/sphinx )
+       xml? ( virtual/pkgconfig )
+       ${PYTHON_DEPS}"
+PDEPEND="
+       sys-devel/clang-common
+       ~sys-devel/clang-runtime-${PV}
+       default-compiler-rt? (
+               =sys-libs/compiler-rt-${PV%_*}*
+               llvm-libunwind? ( sys-libs/llvm-libunwind )
+               !llvm-libunwind? ( sys-libs/libunwind )
+       )
+       default-libcxx? ( >=sys-libs/libcxx-${PV} )
+       default-lld? ( sys-devel/lld )"
+
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+       llvm/lib/Testing/Support
+       llvm/utils/{lit,llvm-lit,unittest}
+       llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+LLVM_PATCHSET=${PV/_/-}
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+# 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).
+
+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
+
+       # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+       eprefixify \
+               lib/Frontend/InitHeaderSearch.cpp \
+               lib/Driver/ToolChains/Darwin.cpp || 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
+                                               ;;
+                                       # headers for clang-tidy static library
+                                       clang-tidy-headers)
+                                               continue
+                                               ;;
+                                       # tools
+                                       clang|clangd|clang-*)
+                                               ;;
+                                       # static libraries
+                                       clang*|findAllSymbols)
+                                               continue
+                                               ;;
+                                       # conditional to USE=doc
+                                       docs-clang-html|docs-clang-tools-html)
+                                               use doc || 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-offload-bundler
+                       clang-offload-wrapper
+                       clang-refactor
+                       clang-repl
+                       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
+               )
+
+               if llvm_are_manpages_built; then
+                       out+=(
+                               # manpages
+                               docs-clang-man
+                               docs-clang-tools-man
+                       )
+               fi
+
+               use doc && out+=(
+                       docs-clang-html
+                       docs-clang-tools-html
+               )
+
+               use static-analyzer && out+=(
+                       clang-check
+                       clang-extdef-mapping
+                       scan-build
+                       scan-build-py
+                       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
+
+               # disable using CUDA to autodetect GPU, just build for all
+               -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+
+               # override default stdlib and rtlib
+               -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+               -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+               -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+               -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind 
"")
+
+               -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+               -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+               -DPython3_EXECUTABLE="${PYTHON}"
+       )
+       use test && mycmakeargs+=(
+               -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+               -DLLVM_LIT_ARGS="$(get_lit_flags)"
+       )
+
+       if multilib_is_native_abi; then
+               local build_docs=OFF
+               if llvm_are_manpages_built; then
+                       build_docs=ON
+                       mycmakeargs+=(
+                               -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
+                       )
+               fi
+               mycmakeargs+=(
+                       
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+                       -DCLANG_INCLUDE_DOCS=${build_docs}
+                       -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+               )
+       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_build distribution
+
+       # 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
+}
+
+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"
+       llvm_install_manpages
+       # 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