commit:     72967e1048f2e376bd4d4432f8f3366c7a4634cc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 09:56:59 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 16:00:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72967e10

sys-devel/clang: Bump to 6.0.0rc2

 sys-devel/clang/Manifest               |   3 +
 sys-devel/clang/clang-6.0.0_rc2.ebuild | 302 +++++++++++++++++++++++++++++++++
 2 files changed, 305 insertions(+)

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 8bb6d69e0ca..174ced32783 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,8 +1,11 @@
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B 
bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac
 SHA512 
936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.1.src.tar.xz 11483036 BLAKE2B 
c4eb54cd8271b62cf7a2219db0b599b68c00b6e574d1946220efbd1633e841796e6717d6eeb35e84a6db32a731a3285b59cedeb3b1a8f3c3c502b799fdd0a720
 SHA512 
6619177a2ff9934fe8b15d6aa229abb8e34d0b1a75228d9efba9393daf71d6419a7256de57b31e2f9f829f71f842118556f996e86ee076f1e0a7cd394dfd31a2
+DIST cfe-6.0.0rc2.src.tar.xz 11957996 BLAKE2B 
65cd91d8b5591e6312f9b46c1deecca5e14db72f58830b5249ca0fbc3b0911ae5bf60c9e1e326cad6eb670d5f2a144229b4e04e5b7645e516b2a530e428cc171
 SHA512 
991c45ee8500bee1e7004172e2ab8fa78e3d412b1474cfb48ee6f49232afe8d2f512e2ebf148afc4f8b38cff0110e3af26bdbec2138d80592c876452a18c63fe
 DIST clang-tools-extra-4.0.1.src.tar.xz 581788 BLAKE2B 
52ca89eda6fe1e0fbbdc46e17f4067f03a9a9440dcdcc98811651087d0c9ab24dfe3eefb0b80a32ec41abe0766cb3e47031de61c4cff02b7d0e08c8fd03e3faa
 SHA512 
ea26d926f428e62e76cf8a073e63ffe05645f6592e05d7717d5c257908870ae9217727d3e1578227b14eda5937085872463f1a8e99970256179c68b8a92e69e0
 DIST clang-tools-extra-5.0.1.src.tar.xz 646328 BLAKE2B 
472eb1e73a17564790919ec392dddcd91f131c1cbf2a5f3cab09a9f7126d4d18ec6785ffcb3c3230eec6edc90acbe2bf859367c37f62ba77d7542f4c18b925f3
 SHA512 
2e6a811cccd22281f7567f5626ff0484ed1fefee4a9244a717e3ccb9516dce9e7ff315044fb10e505e91c3f1c6d2774558debb9559915d053886599bcb153d7b
+DIST clang-tools-extra-6.0.0rc2.src.tar.xz 758068 BLAKE2B 
dd39e975015601a7df327acd76f5dbd46a20858d65f72e8af4b1e2a176f5c98a07c9d2db12dccef1e9127019e78d7201cf82c27c2b372bfae70f55859fca0e94
 SHA512 
0a09582e602603c975ec0eb95c67333fdf7985038a36053b7a63db68709a7a5a5ef4b9b2579f7c53e1c3fc39e28ee3c69e3d484f9ab2841f25abe26a84971917
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 
6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c
 SHA512 
16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1-manpages.tar.bz2 94004 BLAKE2B 
34eb29361ad7aa881e64d1dd2992fd89ce44adafd2521284c27b6ffe7082bc7e70458204e6f34d582b704bf7c5dad93c6a6dc41fc7abc41862aab8f5ec53ed07
 SHA512 
3444cc8e06009f5dd2669b92af662a1049d9294c8ca0dcf45486e1dc1aaf10160860b7856d30ad70bbe5864b21d1539316e89f5237549f5653954e23baf64334
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 
3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e
 SHA512 
bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
+DIST llvm-6.0.0rc2.src.tar.xz 25288140 BLAKE2B 
095f054ce2ccb1eee3def2b8c6cecc610c4392283062338aa20d2de33c951484a2dc6774db2727e19e879307cfc95dda2730185cde8e52f4f45851d8dd809b3e
 SHA512 
3cb3521ba8d90bf2a90c49d753ab5e92f1e0ccfc86946f3767c06d0f276e2c4cf8ff2f984680835efbaa4dae1cd2d3a074468e547785e05a67ea55311b94a0e9
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 
79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01
 SHA512 
d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415

diff --git a/sys-devel/clang/clang-6.0.0_rc2.ebuild 
b/sys-devel/clang/clang-6.0.0_rc2.ebuild
new file mode 100644
index 00000000000..514b588975b
--- /dev/null
+++ b/sys-devel/clang/clang-6.0.0_rc2.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic llvm \
+       multilib-minimal pax-utils prefix python-single-r1 toolchain-funcs
+
+MY_P=cfe-${PV/_/}.src
+EXTRA_P=clang-tools-extra-${PV/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/";
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+       http://prereleases.llvm.org/${PV/_//}/${EXTRA_P}.tar.xz
+       test? ( http:/pre/releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+#      !doc? ( 
https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+       NVPTX PowerPC Sparc SystemZ X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
+       test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// 
/,},${MULTILIB_USEDEP}]
+       static-analyzer? (
+               dev-lang/perl:*
+               z3? ( sci-mathematics/z3:0= )
+       )
+       xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+       ${PYTHON_DEPS}"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+       doc? ( dev-python/sphinx )
+       xml? ( virtual/pkgconfig )
+       !!<dev-python/configparser-3.3.0.2
+       ${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+       !<sys-devel/llvm-4.0.0_rc:0
+       !sys-devel/clang:0"
+PDEPEND="
+       ~sys-devel/clang-runtime-${PV}
+       default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+       default-libcxx? ( sys-libs/libcxx )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+       || ( ${ALL_LLVM_TARGETS[*]} )"
+
+# We need extra level of indirection for CLANG_RESOURCE_DIR
+S=${WORKDIR}/x/y/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+PATCHES=(
+       # add Prefix include paths for Darwin
+       "${FILESDIR}"/5.0.1/darwin_prefix-include-paths.patch
+)
+
+# 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_unpack() {
+       # create extra parent dir for CLANG_RESOURCE_DIR
+       mkdir -p x/y || die
+       cd x/y || die
+
+       einfo "Unpacking ${MY_P}.tar.xz ..."
+       tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+       einfo "Unpacking ${EXTRA_P}.tar.xz ..."
+       tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die
+
+       mv "${EXTRA_P}" "${S}"/tools/extra || die
+       if use test; then
+               einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+               tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+                       "${LLVM_P}"/utils/{lit,llvm-lit,unittest} || die
+               mv "${LLVM_P}" "${WORKDIR}"/llvm || die
+       fi
+
+#      if ! use doc; then
+#              einfo "Unpacking llvm-${PV}-manpages.tar.bz2 ..."
+#              tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
+#      fi
+}
+
+src_prepare() {
+       cmake-utils_src_prepare
+       eprefixify lib/Frontend/InitHeaderSearch.cpp
+}
+
+multilib_src_configure() {
+       local llvm_version=$(llvm-config --version) || die
+       local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+       local mycmakeargs=(
+               # ensure that the correct llvm-config is used
+               -DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+               # relative to bindir
+               -DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+               -DBUILD_SHARED_LIBS=ON
+               -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)
+               # z3 is not multilib-friendly
+               -DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
+       )
+       use test && mycmakeargs+=(
+               -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+               -DLLVM_LIT_ARGS="-vv"
+       )
+
+       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=$(usex doc)
+                       -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
+               )
+               use doc && 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
+               )
+               use z3 && mycmakeargs+=(
+                       -DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
+               )
+       else
+               mycmakeargs+=(
+                       -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+               )
+       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_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+       cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+       cmake-utils_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-utils_src_make check-clang
+       multilib_is_native_abi && cmake-utils_src_make check-clang-tools
+}
+
+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-2 "${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.Y
+       # - clang -> clang-X.Y
+       # - clang++, clang-cl, clang-cpp -> clang
+       # we want to have:
+       # - clang-X.Y
+       # - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
+       # - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
+       # 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() {
+       cmake-utils_src_install
+
+       # 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
+
+       # install pre-generated manpages
+#      if ! use doc; then
+#              insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+#              doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1
+#      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 [[ ${ROOT} == / && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+               eselect compiler-shadow update all
+       fi
+}
+
+pkg_postrm() {
+       if [[ ${ROOT} == / && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+               eselect compiler-shadow clean all
+       fi
+}

Reply via email to