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: Sun, 29 Nov 2020 09:31:02
Message-Id: 1606641533.27c7faca40af6e0f48d092b5ec46436eedc4bd6b.mgorny@gentoo
1 commit: 27c7faca40af6e0f48d092b5ec46436eedc4bd6b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 09:18:53 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 09:18:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c7faca
7
8 sys-devel/clang: Resolve pkgcheck problems
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/clang/clang-10.0.1.ebuild | 11 ++++++++---
13 sys-devel/clang/clang-11.0.0.9999.ebuild | 11 ++++++++---
14 sys-devel/clang/clang-11.0.0.ebuild | 11 ++++++++---
15 sys-devel/clang/clang-12.0.0.9999.ebuild | 11 ++++++++---
16 sys-devel/clang/clang-9.0.1.ebuild | 9 +++++++--
17 5 files changed, 39 insertions(+), 14 deletions(-)
18
19 diff --git a/sys-devel/clang/clang-10.0.1.ebuild b/sys-devel/clang/clang-10.0.1.ebuild
20 index 42c03f5c3c6..866e0622bfe 100644
21 --- a/sys-devel/clang/clang-10.0.1.ebuild
22 +++ b/sys-devel/clang/clang-10.0.1.ebuild
23 @@ -24,7 +24,6 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
24 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
25 "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
26 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
27 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
28
29 # MSVCSetupApi.h: MIT
30 # sorttable.js: MIT
31 @@ -39,10 +38,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
32 RESTRICT="!test? ( test )"
33
34 RDEPEND="
35 - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
36 + ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
37 static-analyzer? ( dev-lang/perl:* )
38 xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
39 ${PYTHON_DEPS}"
40 +for x in "${ALL_LLVM_TARGETS[@]}"; do
41 + RDEPEND+="
42 + ~sys-devel/llvm-${PV}:${SLOT}[${x}]"
43 +done
44 +unset x
45 +
46 DEPEND="${RDEPEND}"
47 BDEPEND="
48 doc? ( dev-python/sphinx )
49 @@ -199,7 +204,7 @@ get_distribution_components() {
50 modularize
51 pp-trace
52 )
53 -
54 +
55 if llvm_are_manpages_built; then
56 out+=(
57 # manpages
58
59 diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild
60 index a228b39cd4d..7be842f5ff2 100644
61 --- a/sys-devel/clang/clang-11.0.0.9999.ebuild
62 +++ b/sys-devel/clang/clang-11.0.0.9999.ebuild
63 @@ -16,7 +16,6 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
64 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
65 "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
66 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
67 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
68
69 # MSVCSetupApi.h: MIT
70 # sorttable.js: MIT
71 @@ -31,10 +30,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
72 RESTRICT="!test? ( test )"
73
74 RDEPEND="
75 - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
76 + ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
77 static-analyzer? ( dev-lang/perl:* )
78 xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
79 ${PYTHON_DEPS}"
80 +for x in "${ALL_LLVM_TARGETS[@]}"; do
81 + RDEPEND+="
82 + ~sys-devel/llvm-${PV}:${SLOT}[${x}]"
83 +done
84 +unset x
85 +
86 DEPEND="${RDEPEND}"
87 BDEPEND="
88 >=dev-util/cmake-3.16
89 @@ -194,7 +199,7 @@ get_distribution_components() {
90 modularize
91 pp-trace
92 )
93 -
94 +
95 if llvm_are_manpages_built; then
96 out+=(
97 # manpages
98
99 diff --git a/sys-devel/clang/clang-11.0.0.ebuild b/sys-devel/clang/clang-11.0.0.ebuild
100 index a7451bfd4bd..3205d44ae7e 100644
101 --- a/sys-devel/clang/clang-11.0.0.ebuild
102 +++ b/sys-devel/clang/clang-11.0.0.ebuild
103 @@ -24,7 +24,6 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
104 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
105 "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
106 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
107 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
108
109 # MSVCSetupApi.h: MIT
110 # sorttable.js: MIT
111 @@ -39,10 +38,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
112 RESTRICT="!test? ( test )"
113
114 RDEPEND="
115 - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
116 + ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
117 static-analyzer? ( dev-lang/perl:* )
118 xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
119 ${PYTHON_DEPS}"
120 +for x in "${ALL_LLVM_TARGETS[@]}"; do
121 + RDEPEND+="
122 + ~sys-devel/llvm-${PV}:${SLOT}[${x}]"
123 +done
124 +unset x
125 +
126 DEPEND="${RDEPEND}"
127 BDEPEND="
128 >=dev-util/cmake-3.16
129 @@ -193,7 +198,7 @@ get_distribution_components() {
130 modularize
131 pp-trace
132 )
133 -
134 +
135 if llvm_are_manpages_built; then
136 out+=(
137 # manpages
138
139 diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild
140 index 0e296111e06..83d795ccdb6 100644
141 --- a/sys-devel/clang/clang-12.0.0.9999.ebuild
142 +++ b/sys-devel/clang/clang-12.0.0.9999.ebuild
143 @@ -16,7 +16,6 @@ ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
144 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
145 "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
146 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
147 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
148
149 # MSVCSetupApi.h: MIT
150 # sorttable.js: MIT
151 @@ -31,10 +30,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
152 RESTRICT="!test? ( test )"
153
154 RDEPEND="
155 - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
156 + ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
157 static-analyzer? ( dev-lang/perl:* )
158 xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
159 ${PYTHON_DEPS}"
160 +for x in "${ALL_LLVM_TARGETS[@]}"; do
161 + RDEPEND+="
162 + ~sys-devel/llvm-${PV}:${SLOT}[${x}]"
163 +done
164 +unset x
165 +
166 DEPEND="${RDEPEND}"
167 BDEPEND="
168 >=dev-util/cmake-3.16
169 @@ -192,7 +197,7 @@ get_distribution_components() {
170 modularize
171 pp-trace
172 )
173 -
174 +
175 if llvm_are_manpages_built; then
176 out+=(
177 # manpages
178
179 diff --git a/sys-devel/clang/clang-9.0.1.ebuild b/sys-devel/clang/clang-9.0.1.ebuild
180 index 939ba4511a7..da0c00cb9a8 100644
181 --- a/sys-devel/clang/clang-9.0.1.ebuild
182 +++ b/sys-devel/clang/clang-9.0.1.ebuild
183 @@ -25,7 +25,6 @@ S=${WORKDIR}/x/y/clang
184 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
185 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
186 ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
187 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
188
189 # MSVCSetupApi.h: MIT
190 # sorttable.js: MIT
191 @@ -40,10 +39,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
192 RESTRICT="!test? ( test )"
193
194 RDEPEND="
195 - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
196 + ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
197 static-analyzer? ( dev-lang/perl:* )
198 xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
199 ${PYTHON_DEPS}"
200 +for x in "${ALL_LLVM_TARGETS[@]}"; do
201 + RDEPEND+="
202 + ~sys-devel/llvm-${PV}:${SLOT}[${x}]"
203 +done
204 +unset x
205 +
206 DEPEND="${RDEPEND}"
207 BDEPEND="
208 doc? ( dev-python/sphinx )