diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-10 17:26:49 +0100 |
| commit | 6957f5c65b02bba533954eabc0b62f5de36be206 (patch) | |
| tree | 21d8ab8f61dffd9cccc82d0badb68982516a6855 /sys-devel/clang | |
| parent | e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (diff) | |
gentoo resync : 10.04.2018
Diffstat (limited to 'sys-devel/clang')
| -rw-r--r-- | sys-devel/clang/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/clang/clang-9999.ebuild | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index 56052aa5f90d..7f24b020d3f1 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -29,5 +29,5 @@ EBUILD clang-4.0.1.ebuild 9614 BLAKE2B ba22e432cd595ecb6a4c13fd4a6de428242b13138 EBUILD clang-5.0.1.ebuild 10440 BLAKE2B 13bc01d728e98302c8f1708c805e5528fa5f924ac892f17a3f06684fc43448e8d97159f1b9361e633eaccf0717242c4778481f10bff92063256b3307bf7197ab SHA512 57b7dc557e5144d3cc9f7c7560ffaa51ca5af184031b01acb74fd565171d80bfd973f82c7406f8dc624d59f183f12aea8e925465e1059ce1f8a8ce2c2d2fdd94 EBUILD clang-6.0.0-r1.ebuild 10442 BLAKE2B fa6fce2064b50cedfa4fbf4584f135b605810c39a70d32323f06eef5883c82a77918c0d66fd7b13de5f0bdc55e4c16f484c7fe43c1cfde07704c17fe79629b3e SHA512 9392f1949b9f6a522840acbd54ddb187eb5680cd665790ac55eb279580f36325a747c0e4b9845b605483e7f64abddad1f1232c708c26578562bf1906f4310316 EBUILD clang-6.0.9999.ebuild 9415 BLAKE2B c605173c0fbe72841bb6dd63c3f7823c8aeb170c6fdab53a6a0e3470595cd537ed9ad82187d54e2bf2f4d5a19857f509fc0c4cc26824cdc06069340538d7223f SHA512 aba7391f35fb3c47b4d6f447d69bd44c44658bd95171ea74924687a0daff1a1483a94a096e57131da86cbbf6642b513c3ad39d133f2a589e4b8e5b053d3e66a6 -EBUILD clang-9999.ebuild 9480 BLAKE2B 683b5ca49ec0adab805c9e6b1fac0d22dc7bbd32e03b9f4ee07f5aff2b46b7462cd9536dda6f7b2eb9fd44ba46013efd3e139bfaf206832ef2e2978b94755835 SHA512 671e1291ca5a70d851b1934a9c2d299838808ace9df9067b8f562a1c244813ed37f82865793b448ba0d2a304431550b9e463b21960c5058470da1cdbe83c07b8 +EBUILD clang-9999.ebuild 9487 BLAKE2B d8705c29b9a4e60608af3910a47e91d5a16cf531370b968511e96261207747cdf47981d2ab435a8c1e3ba4fda863248a299609ef2ae79c04aa2f6d68ad586daf SHA512 434bcd703b29bd9491368c0f665581cf3d2569743b311d6430031baf7943ed7d7c1dbd27b8c243c087a709bc0d4e04605648066a7d237888d78b2bd5df179e31 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932 diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index d769bda1d033..0ece5c802161 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -99,7 +99,8 @@ src_unpack() { "${S}"/tools/extra if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' utils/{lit,llvm-lit,unittest} + "${WORKDIR}"/llvm '' \ + lib/Testing/Support utils/{lit,llvm-lit,unittest} fi git-r3_checkout "${EGIT_REPO_URI}" "${S}" } @@ -218,19 +219,19 @@ src_install() { # 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_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.Y - # - clang -> clang-X.Y + # - clang-X + # - clang -> clang-X # - 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 + # - 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 |