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/llvm/
Date: Mon, 26 Oct 2020 16:49:00
Message-Id: 1603730921.a338e5ac4f704a03ac8ba0fb905c0f9011bf9eb5.mgorny@gentoo
1 commit: a338e5ac4f704a03ac8ba0fb905c0f9011bf9eb5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 11:34:01 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 16:48:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a338e5ac
7
8 sys-devel/llvm: Reuse eclass manpage build logic for 10.0.1+
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/llvm/llvm-10.0.1.ebuild | 51 +++++++++++++++++++++-------------
13 sys-devel/llvm/llvm-11.0.0.9999.ebuild | 51 +++++++++++++++++++++-------------
14 sys-devel/llvm/llvm-11.0.0.ebuild | 51 +++++++++++++++++++++-------------
15 sys-devel/llvm/llvm-12.0.0.9999.ebuild | 51 +++++++++++++++++++++-------------
16 4 files changed, 128 insertions(+), 76 deletions(-)
17
18 diff --git a/sys-devel/llvm/llvm-10.0.1.ebuild b/sys-devel/llvm/llvm-10.0.1.ebuild
19 index b162bfbdf27..819b1086a7b 100644
20 --- a/sys-devel/llvm/llvm-10.0.1.ebuild
21 +++ b/sys-devel/llvm/llvm-10.0.1.ebuild
22 @@ -10,6 +10,7 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
23 DESCRIPTION="Low Level Virtual Machine"
24 HOMEPAGE="https://llvm.org/"
25 LLVM_COMPONENTS=( llvm )
26 +LLVM_MANPAGES=build
27 llvm.org_set_globals
28
29 # Those are in lib/Targets, without explicit CMakeLists.txt mention
30 @@ -58,11 +59,12 @@ BDEPEND="
31 <sys-libs/libcxx-$(ver_cut 1-3).9999
32 >=sys-devel/binutils-apple-5.1
33 )
34 - libffi? ( virtual/pkgconfig )
35 - $(python_gen_any_dep '
36 + doc? ( $(python_gen_any_dep '
37 + dev-python/recommonmark[${PYTHON_USEDEP}]
38 dev-python/sphinx[${PYTHON_USEDEP}]
39 - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] )
40 - ')"
41 + ') )
42 + libffi? ( virtual/pkgconfig )
43 + ${PYTHON_DEPS}"
44 # There are no file collisions between these versions but having :0
45 # installed means llvm-config there will take precedence.
46 RDEPEND="${RDEPEND}
47 @@ -77,10 +79,9 @@ PATCHES=(
48 )
49
50 python_check_deps() {
51 - if use doc; then
52 - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" ||
53 - return 1
54 - fi
55 + use doc || return 0
56 +
57 + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
58 has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
59 }
60
61 @@ -111,7 +112,7 @@ check_distribution_components() {
62 ;;
63 # used only w/ USE=doc
64 docs-llvm-html)
65 - continue
66 + use doc || continue
67 ;;
68 esac
69
70 @@ -275,12 +276,16 @@ get_distribution_components() {
71
72 # python modules
73 opt-viewer
74 -
75 - # manpages
76 - docs-dsymutil-man
77 - docs-llvm-dwarfdump-man
78 - docs-llvm-man
79 )
80 +
81 + if llvm_are_manpages_built; then
82 + out+=(
83 + # manpages
84 + docs-dsymutil-man
85 + docs-llvm-dwarfdump-man
86 + docs-llvm-man
87 + )
88 + fi
89 use doc && out+=(
90 docs-llvm-html
91 )
92 @@ -362,15 +367,22 @@ multilib_src_configure() {
93 )
94
95 if multilib_is_native_abi; then
96 + local build_docs=OFF
97 + if llvm_are_manpages_built; then
98 + build_docs=ON
99 + mycmakeargs+=(
100 + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
101 + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
102 + -DSPHINX_WARNINGS_AS_ERRORS=OFF
103 + )
104 + fi
105 +
106 mycmakeargs+=(
107 - -DLLVM_BUILD_DOCS=ON
108 + -DLLVM_BUILD_DOCS=${build_docs}
109 -DLLVM_ENABLE_OCAMLDOC=OFF
110 - -DLLVM_ENABLE_SPHINX=ON
111 + -DLLVM_ENABLE_SPHINX=${build_docs}
112 -DLLVM_ENABLE_DOXYGEN=OFF
113 -DLLVM_INSTALL_UTILS=ON
114 - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
115 - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
116 - -DSPHINX_WARNINGS_AS_ERRORS=OFF
117 )
118 use gold && mycmakeargs+=(
119 -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
120 @@ -465,6 +477,7 @@ multilib_src_install_all() {
121 _EOF_
122
123 docompress "/usr/lib/llvm/${SLOT}/share/man"
124 + llvm_install_manpages
125 }
126
127 pkg_postinst() {
128
129 diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
130 index fd13357643c..8e4357a1098 100644
131 --- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild
132 +++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
133 @@ -10,6 +10,7 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
134 DESCRIPTION="Low Level Virtual Machine"
135 HOMEPAGE="https://llvm.org/"
136 LLVM_COMPONENTS=( llvm )
137 +LLVM_MANPAGES=build
138 llvm.org_set_globals
139
140 # Those are in lib/Targets, without explicit CMakeLists.txt mention
141 @@ -59,11 +60,12 @@ BDEPEND="
142 <sys-libs/libcxx-$(ver_cut 1-3).9999
143 >=sys-devel/binutils-apple-5.1
144 )
145 - libffi? ( virtual/pkgconfig )
146 - $(python_gen_any_dep '
147 + doc? ( $(python_gen_any_dep '
148 + dev-python/recommonmark[${PYTHON_USEDEP}]
149 dev-python/sphinx[${PYTHON_USEDEP}]
150 - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] )
151 - ')"
152 + ') )
153 + libffi? ( virtual/pkgconfig )
154 + ${PYTHON_DEPS}"
155 # There are no file collisions between these versions but having :0
156 # installed means llvm-config there will take precedence.
157 RDEPEND="${RDEPEND}
158 @@ -72,10 +74,9 @@ PDEPEND="sys-devel/llvm-common
159 gold? ( >=sys-devel/llvmgold-${SLOT} )"
160
161 python_check_deps() {
162 - if use doc; then
163 - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" ||
164 - return 1
165 - fi
166 + use doc || return 0
167 +
168 + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
169 has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
170 }
171
172 @@ -138,7 +139,7 @@ check_distribution_components() {
173 ;;
174 # used only w/ USE=doc
175 docs-llvm-html)
176 - continue
177 + use doc || continue
178 ;;
179 esac
180
181 @@ -302,12 +303,16 @@ get_distribution_components() {
182
183 # python modules
184 opt-viewer
185 -
186 - # manpages
187 - docs-dsymutil-man
188 - docs-llvm-dwarfdump-man
189 - docs-llvm-man
190 )
191 +
192 + if llvm_are_manpages_built; then
193 + out+=(
194 + # manpages
195 + docs-dsymutil-man
196 + docs-llvm-dwarfdump-man
197 + docs-llvm-man
198 + )
199 + fi
200 use doc && out+=(
201 docs-llvm-html
202 )
203 @@ -391,15 +396,22 @@ multilib_src_configure() {
204 )
205
206 if multilib_is_native_abi; then
207 + local build_docs=OFF
208 + if llvm_are_manpages_built; then
209 + build_docs=ON
210 + mycmakeargs+=(
211 + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
212 + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
213 + -DSPHINX_WARNINGS_AS_ERRORS=OFF
214 + )
215 + fi
216 +
217 mycmakeargs+=(
218 - -DLLVM_BUILD_DOCS=ON
219 + -DLLVM_BUILD_DOCS=${build_docs}
220 -DLLVM_ENABLE_OCAMLDOC=OFF
221 - -DLLVM_ENABLE_SPHINX=ON
222 + -DLLVM_ENABLE_SPHINX=${build_docs}
223 -DLLVM_ENABLE_DOXYGEN=OFF
224 -DLLVM_INSTALL_UTILS=ON
225 - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
226 - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
227 - -DSPHINX_WARNINGS_AS_ERRORS=OFF
228 )
229 use gold && mycmakeargs+=(
230 -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
231 @@ -494,6 +506,7 @@ multilib_src_install_all() {
232 _EOF_
233
234 docompress "/usr/lib/llvm/${SLOT}/share/man"
235 + llvm_install_manpages
236 }
237
238 pkg_postinst() {
239
240 diff --git a/sys-devel/llvm/llvm-11.0.0.ebuild b/sys-devel/llvm/llvm-11.0.0.ebuild
241 index 1a9eb3f6406..4f4194c6cef 100644
242 --- a/sys-devel/llvm/llvm-11.0.0.ebuild
243 +++ b/sys-devel/llvm/llvm-11.0.0.ebuild
244 @@ -10,6 +10,7 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
245 DESCRIPTION="Low Level Virtual Machine"
246 HOMEPAGE="https://llvm.org/"
247 LLVM_COMPONENTS=( llvm )
248 +LLVM_MANPAGES=build
249 llvm.org_set_globals
250
251 # Those are in lib/Targets, without explicit CMakeLists.txt mention
252 @@ -59,11 +60,12 @@ BDEPEND="
253 <sys-libs/libcxx-$(ver_cut 1-3).9999
254 >=sys-devel/binutils-apple-5.1
255 )
256 - libffi? ( virtual/pkgconfig )
257 - $(python_gen_any_dep '
258 + doc? ( $(python_gen_any_dep '
259 + dev-python/recommonmark[${PYTHON_USEDEP}]
260 dev-python/sphinx[${PYTHON_USEDEP}]
261 - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] )
262 - ')"
263 + ') )
264 + libffi? ( virtual/pkgconfig )
265 + ${PYTHON_DEPS}"
266 # There are no file collisions between these versions but having :0
267 # installed means llvm-config there will take precedence.
268 RDEPEND="${RDEPEND}
269 @@ -72,10 +74,9 @@ PDEPEND="sys-devel/llvm-common
270 gold? ( >=sys-devel/llvmgold-${SLOT} )"
271
272 python_check_deps() {
273 - if use doc; then
274 - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" ||
275 - return 1
276 - fi
277 + use doc || return 0
278 +
279 + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
280 has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
281 }
282
283 @@ -138,7 +139,7 @@ check_distribution_components() {
284 ;;
285 # used only w/ USE=doc
286 docs-llvm-html)
287 - continue
288 + use doc || continue
289 ;;
290 esac
291
292 @@ -302,12 +303,16 @@ get_distribution_components() {
293
294 # python modules
295 opt-viewer
296 -
297 - # manpages
298 - docs-dsymutil-man
299 - docs-llvm-dwarfdump-man
300 - docs-llvm-man
301 )
302 +
303 + if llvm_are_manpages_built; then
304 + out+=(
305 + # manpages
306 + docs-dsymutil-man
307 + docs-llvm-dwarfdump-man
308 + docs-llvm-man
309 + )
310 + fi
311 use doc && out+=(
312 docs-llvm-html
313 )
314 @@ -391,15 +396,22 @@ multilib_src_configure() {
315 )
316
317 if multilib_is_native_abi; then
318 + local build_docs=OFF
319 + if llvm_are_manpages_built; then
320 + build_docs=ON
321 + mycmakeargs+=(
322 + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
323 + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
324 + -DSPHINX_WARNINGS_AS_ERRORS=OFF
325 + )
326 + fi
327 +
328 mycmakeargs+=(
329 - -DLLVM_BUILD_DOCS=ON
330 + -DLLVM_BUILD_DOCS=${build_docs}
331 -DLLVM_ENABLE_OCAMLDOC=OFF
332 - -DLLVM_ENABLE_SPHINX=ON
333 + -DLLVM_ENABLE_SPHINX=${build_docs}
334 -DLLVM_ENABLE_DOXYGEN=OFF
335 -DLLVM_INSTALL_UTILS=ON
336 - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
337 - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
338 - -DSPHINX_WARNINGS_AS_ERRORS=OFF
339 )
340 use gold && mycmakeargs+=(
341 -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
342 @@ -494,6 +506,7 @@ multilib_src_install_all() {
343 _EOF_
344
345 docompress "/usr/lib/llvm/${SLOT}/share/man"
346 + llvm_install_manpages
347 }
348
349 pkg_postinst() {
350
351 diff --git a/sys-devel/llvm/llvm-12.0.0.9999.ebuild b/sys-devel/llvm/llvm-12.0.0.9999.ebuild
352 index 9c432a044b6..67438844e8e 100644
353 --- a/sys-devel/llvm/llvm-12.0.0.9999.ebuild
354 +++ b/sys-devel/llvm/llvm-12.0.0.9999.ebuild
355 @@ -10,6 +10,7 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
356 DESCRIPTION="Low Level Virtual Machine"
357 HOMEPAGE="https://llvm.org/"
358 LLVM_COMPONENTS=( llvm )
359 +LLVM_MANPAGES=build
360 llvm.org_set_globals
361
362 # Those are in lib/Targets, without explicit CMakeLists.txt mention
363 @@ -59,11 +60,12 @@ BDEPEND="
364 <sys-libs/libcxx-$(ver_cut 1-3).9999
365 >=sys-devel/binutils-apple-5.1
366 )
367 - libffi? ( virtual/pkgconfig )
368 - $(python_gen_any_dep '
369 + doc? ( $(python_gen_any_dep '
370 + dev-python/recommonmark[${PYTHON_USEDEP}]
371 dev-python/sphinx[${PYTHON_USEDEP}]
372 - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] )
373 - ')"
374 + ') )
375 + libffi? ( virtual/pkgconfig )
376 + ${PYTHON_DEPS}"
377 # There are no file collisions between these versions but having :0
378 # installed means llvm-config there will take precedence.
379 RDEPEND="${RDEPEND}
380 @@ -72,10 +74,9 @@ PDEPEND="sys-devel/llvm-common
381 gold? ( >=sys-devel/llvmgold-${SLOT} )"
382
383 python_check_deps() {
384 - if use doc; then
385 - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" ||
386 - return 1
387 - fi
388 + use doc || return 0
389 +
390 + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
391 has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
392 }
393
394 @@ -138,7 +139,7 @@ check_distribution_components() {
395 ;;
396 # used only w/ USE=doc
397 docs-llvm-html)
398 - continue
399 + use doc || continue
400 ;;
401 esac
402
403 @@ -303,12 +304,16 @@ get_distribution_components() {
404
405 # python modules
406 opt-viewer
407 -
408 - # manpages
409 - docs-dsymutil-man
410 - docs-llvm-dwarfdump-man
411 - docs-llvm-man
412 )
413 +
414 + if llvm_are_manpages_built; then
415 + out+=(
416 + # manpages
417 + docs-dsymutil-man
418 + docs-llvm-dwarfdump-man
419 + docs-llvm-man
420 + )
421 + fi
422 use doc && out+=(
423 docs-llvm-html
424 )
425 @@ -392,15 +397,22 @@ multilib_src_configure() {
426 )
427
428 if multilib_is_native_abi; then
429 + local build_docs=OFF
430 + if llvm_are_manpages_built; then
431 + build_docs=ON
432 + mycmakeargs+=(
433 + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
434 + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
435 + -DSPHINX_WARNINGS_AS_ERRORS=OFF
436 + )
437 + fi
438 +
439 mycmakeargs+=(
440 - -DLLVM_BUILD_DOCS=ON
441 + -DLLVM_BUILD_DOCS=${build_docs}
442 -DLLVM_ENABLE_OCAMLDOC=OFF
443 - -DLLVM_ENABLE_SPHINX=ON
444 + -DLLVM_ENABLE_SPHINX=${build_docs}
445 -DLLVM_ENABLE_DOXYGEN=OFF
446 -DLLVM_INSTALL_UTILS=ON
447 - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
448 - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
449 - -DSPHINX_WARNINGS_AS_ERRORS=OFF
450 )
451 use gold && mycmakeargs+=(
452 -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
453 @@ -495,6 +507,7 @@ multilib_src_install_all() {
454 _EOF_
455
456 docompress "/usr/lib/llvm/${SLOT}/share/man"
457 + llvm_install_manpages
458 }
459
460 pkg_postinst() {