Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/
Date: Tue, 18 Aug 2020 16:51:55
Message-Id: 1597769501.905d7440aed62f76289b2306479685bfc1040466.mgorny@gentoo
1 commit: 905d7440aed62f76289b2306479685bfc1040466
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 18 15:22:12 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 18 16:51:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905d7440
7
8 sys-devel/clang: Add USE=default-lld
9
10 Closes: https://bugs.gentoo.org/737178
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 sys-devel/clang/clang-10.0.1.ebuild | 8 +++++---
14 sys-devel/clang/clang-11.0.0.9999.ebuild | 8 +++++---
15 sys-devel/clang/clang-11.0.0_rc1.ebuild | 8 +++++---
16 sys-devel/clang/clang-12.0.0.9999.ebuild | 8 +++++---
17 sys-devel/clang/metadata.xml | 1 +
18 5 files changed, 21 insertions(+), 12 deletions(-)
19
20 diff --git a/sys-devel/clang/clang-10.0.1.ebuild b/sys-devel/clang/clang-10.0.1.ebuild
21 index d7adac06116..e50c60093b5 100644
22 --- a/sys-devel/clang/clang-10.0.1.ebuild
23 +++ b/sys-devel/clang/clang-10.0.1.ebuild
24 @@ -30,8 +30,8 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
25 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
26 SLOT="$(ver_cut 1)"
27 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
28 -IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
29 - test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
30 +IUSE="debug default-compiler-rt default-libcxx default-lld doc
31 + +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
32 REQUIRED_USE="${PYTHON_REQUIRED_USE}
33 || ( ${ALL_LLVM_TARGETS[*]} )"
34 RESTRICT="!test? ( test )"
35 @@ -53,7 +53,8 @@ PDEPEND="
36 sys-devel/clang-common
37 ~sys-devel/clang-runtime-${PV}
38 default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
39 - default-libcxx? ( >=sys-libs/libcxx-${PV} )"
40 + default-libcxx? ( >=sys-libs/libcxx-${PV} )
41 + default-lld? ( sys-devel/lld )"
42
43 # Multilib notes:
44 # 1. ABI_* flags control ABIs libclang* is built for only.
45 @@ -247,6 +248,7 @@ multilib_src_configure() {
46 # override default stdlib and rtlib
47 -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
48 -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
49 + -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
50
51 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
52 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
53
54 diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild
55 index 16ef6847b50..8f5be4425a4 100644
56 --- a/sys-devel/clang/clang-11.0.0.9999.ebuild
57 +++ b/sys-devel/clang/clang-11.0.0.9999.ebuild
58 @@ -31,8 +31,8 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
59 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
60 SLOT="$(ver_cut 1)"
61 KEYWORDS=""
62 -IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
63 - test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
64 +IUSE="debug default-compiler-rt default-libcxx default-lld
65 + doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
66 REQUIRED_USE="${PYTHON_REQUIRED_USE}
67 || ( ${ALL_LLVM_TARGETS[*]} )"
68 RESTRICT="!test? ( test )"
69 @@ -54,7 +54,8 @@ PDEPEND="
70 sys-devel/clang-common
71 ~sys-devel/clang-runtime-${PV}
72 default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
73 - default-libcxx? ( >=sys-libs/libcxx-${PV} )"
74 + default-libcxx? ( >=sys-libs/libcxx-${PV} )
75 + default-lld? ( sys-devel/lld )"
76
77 # Multilib notes:
78 # 1. ABI_* flags control ABIs libclang* is built for only.
79 @@ -241,6 +242,7 @@ multilib_src_configure() {
80 # override default stdlib and rtlib
81 -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
82 -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
83 + -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
84
85 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
86 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
87
88 diff --git a/sys-devel/clang/clang-11.0.0_rc1.ebuild b/sys-devel/clang/clang-11.0.0_rc1.ebuild
89 index 16ef6847b50..8f5be4425a4 100644
90 --- a/sys-devel/clang/clang-11.0.0_rc1.ebuild
91 +++ b/sys-devel/clang/clang-11.0.0_rc1.ebuild
92 @@ -31,8 +31,8 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
93 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
94 SLOT="$(ver_cut 1)"
95 KEYWORDS=""
96 -IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
97 - test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
98 +IUSE="debug default-compiler-rt default-libcxx default-lld
99 + doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
100 REQUIRED_USE="${PYTHON_REQUIRED_USE}
101 || ( ${ALL_LLVM_TARGETS[*]} )"
102 RESTRICT="!test? ( test )"
103 @@ -54,7 +54,8 @@ PDEPEND="
104 sys-devel/clang-common
105 ~sys-devel/clang-runtime-${PV}
106 default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
107 - default-libcxx? ( >=sys-libs/libcxx-${PV} )"
108 + default-libcxx? ( >=sys-libs/libcxx-${PV} )
109 + default-lld? ( sys-devel/lld )"
110
111 # Multilib notes:
112 # 1. ABI_* flags control ABIs libclang* is built for only.
113 @@ -241,6 +242,7 @@ multilib_src_configure() {
114 # override default stdlib and rtlib
115 -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
116 -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
117 + -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
118
119 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
120 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
121
122 diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild
123 index 16ef6847b50..8f5be4425a4 100644
124 --- a/sys-devel/clang/clang-12.0.0.9999.ebuild
125 +++ b/sys-devel/clang/clang-12.0.0.9999.ebuild
126 @@ -31,8 +31,8 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
127 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
128 SLOT="$(ver_cut 1)"
129 KEYWORDS=""
130 -IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
131 - test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
132 +IUSE="debug default-compiler-rt default-libcxx default-lld
133 + doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
134 REQUIRED_USE="${PYTHON_REQUIRED_USE}
135 || ( ${ALL_LLVM_TARGETS[*]} )"
136 RESTRICT="!test? ( test )"
137 @@ -54,7 +54,8 @@ PDEPEND="
138 sys-devel/clang-common
139 ~sys-devel/clang-runtime-${PV}
140 default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
141 - default-libcxx? ( >=sys-libs/libcxx-${PV} )"
142 + default-libcxx? ( >=sys-libs/libcxx-${PV} )
143 + default-lld? ( sys-devel/lld )"
144
145 # Multilib notes:
146 # 1. ABI_* flags control ABIs libclang* is built for only.
147 @@ -241,6 +242,7 @@ multilib_src_configure() {
148 # override default stdlib and rtlib
149 -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
150 -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
151 + -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
152
153 -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
154 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
155
156 diff --git a/sys-devel/clang/metadata.xml b/sys-devel/clang/metadata.xml
157 index b5c629ffdb4..8ccb21d3a05 100644
158 --- a/sys-devel/clang/metadata.xml
159 +++ b/sys-devel/clang/metadata.xml
160 @@ -29,6 +29,7 @@ Conformance with C/C++/ObjC and their variants</longdescription>
161 <use>
162 <flag name="default-compiler-rt">Use compiler-rt instead of libgcc as the default rtlib for clang</flag>
163 <flag name="default-libcxx">Use libc++ instead of libstdc++ as the default stdlib for clang</flag>
164 + <flag name="default-lld">Use lld as the default linker for clang</flag>
165 <flag name="static-analyzer">Install the Clang static analyzer</flag>
166 </use>
167 </pkgmetadata>