1 |
commit: c5a58952083aa9392b1944ec73942494a2440198 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 7 21:04:52 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 7 21:29:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a58952 |
7 |
|
8 |
sys-devel/clang: Update for clang-X naming in -9999 |
9 |
|
10 |
Upstream has removed the minor version from clang symlink in git. |
11 |
Update our code accordingly. |
12 |
|
13 |
sys-devel/clang/clang-9999.ebuild | 12 ++++++------ |
14 |
1 file changed, 6 insertions(+), 6 deletions(-) |
15 |
|
16 |
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild |
17 |
index 8bc9b08cc45..0ece5c80216 100644 |
18 |
--- a/sys-devel/clang/clang-9999.ebuild |
19 |
+++ b/sys-devel/clang/clang-9999.ebuild |
20 |
@@ -219,19 +219,19 @@ src_install() { |
21 |
# Apply CHOST and version suffix to clang tools |
22 |
# note: we use two version components here (vs 3 in runtime path) |
23 |
local llvm_version=$(llvm-config --version) || die |
24 |
- local clang_version=$(ver_cut 1-2 "${llvm_version}") |
25 |
+ local clang_version=$(ver_cut 1 "${llvm_version}") |
26 |
local clang_full_version=$(ver_cut 1-3 "${llvm_version}") |
27 |
local clang_tools=( clang clang++ clang-cl clang-cpp ) |
28 |
local abi i |
29 |
|
30 |
# cmake gives us: |
31 |
- # - clang-X.Y |
32 |
- # - clang -> clang-X.Y |
33 |
+ # - clang-X |
34 |
+ # - clang -> clang-X |
35 |
# - clang++, clang-cl, clang-cpp -> clang |
36 |
# we want to have: |
37 |
- # - clang-X.Y |
38 |
- # - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y |
39 |
- # - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y |
40 |
+ # - clang-X |
41 |
+ # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X |
42 |
+ # - clang, clang++, clang-cl, clang-cpp -> clang*-X |
43 |
# also in CHOST variant |
44 |
for i in "${clang_tools[@]:1}"; do |
45 |
rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die |