| 1 |
commit: 4ed38fe356eb6729a4fec7578c2c775af91755bc |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 26 12:20:02 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=4ed38fe3 |
| 7 |
|
| 8 |
sys-devel/clang: 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/clang/clang-10.0.1.ebuild | 39 ++++++++++++++++++++----------- |
| 13 |
sys-devel/clang/clang-11.0.0.9999.ebuild | 39 ++++++++++++++++++++----------- |
| 14 |
sys-devel/clang/clang-11.0.0.ebuild | 39 ++++++++++++++++++++----------- |
| 15 |
sys-devel/clang/clang-12.0.0.9999.ebuild | 40 ++++++++++++++++++++------------ |
| 16 |
4 files changed, 103 insertions(+), 54 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-devel/clang/clang-10.0.1.ebuild b/sys-devel/clang/clang-10.0.1.ebuild |
| 19 |
index d3aad2e7443..547b3a5ef49 100644 |
| 20 |
--- a/sys-devel/clang/clang-10.0.1.ebuild |
| 21 |
+++ b/sys-devel/clang/clang-10.0.1.ebuild |
| 22 |
@@ -10,6 +10,7 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \ |
| 23 |
DESCRIPTION="C language family frontend for LLVM" |
| 24 |
HOMEPAGE="https://llvm.org/" |
| 25 |
LLVM_COMPONENTS=( clang clang-tools-extra ) |
| 26 |
+LLVM_MANPAGES=build |
| 27 |
LLVM_TEST_COMPONENTS=( |
| 28 |
llvm/lib/Testing/Support |
| 29 |
llvm/utils/{lit,llvm-lit,unittest} |
| 30 |
@@ -43,7 +44,7 @@ RDEPEND=" |
| 31 |
${PYTHON_DEPS}" |
| 32 |
DEPEND="${RDEPEND}" |
| 33 |
BDEPEND=" |
| 34 |
- dev-python/sphinx |
| 35 |
+ doc? ( dev-python/sphinx ) |
| 36 |
xml? ( virtual/pkgconfig ) |
| 37 |
${PYTHON_DEPS}" |
| 38 |
RDEPEND="${RDEPEND} |
| 39 |
@@ -116,7 +117,7 @@ check_distribution_components() { |
| 40 |
;; |
| 41 |
# conditional to USE=doc |
| 42 |
docs-clang-html|docs-clang-tools-html) |
| 43 |
- continue |
| 44 |
+ use doc || continue |
| 45 |
;; |
| 46 |
esac |
| 47 |
|
| 48 |
@@ -196,11 +197,15 @@ get_distribution_components() { |
| 49 |
find-all-symbols |
| 50 |
modularize |
| 51 |
pp-trace |
| 52 |
- |
| 53 |
- # manpages |
| 54 |
- docs-clang-man |
| 55 |
- docs-clang-tools-man |
| 56 |
) |
| 57 |
+ |
| 58 |
+ if llvm_are_manpages_built; then |
| 59 |
+ out+=( |
| 60 |
+ # manpages |
| 61 |
+ docs-clang-man |
| 62 |
+ docs-clang-tools-man |
| 63 |
+ ) |
| 64 |
+ fi |
| 65 |
|
| 66 |
use doc && out+=( |
| 67 |
docs-clang-html |
| 68 |
@@ -259,16 +264,23 @@ multilib_src_configure() { |
| 69 |
) |
| 70 |
|
| 71 |
if multilib_is_native_abi; then |
| 72 |
+ local build_docs=OFF |
| 73 |
+ if llvm_are_manpages_built; then |
| 74 |
+ build_docs=ON |
| 75 |
+ mycmakeargs+=( |
| 76 |
+ -DLLVM_BUILD_DOCS=ON |
| 77 |
+ -DLLVM_ENABLE_SPHINX=ON |
| 78 |
+ -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 79 |
+ -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 80 |
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 81 |
+ ) |
| 82 |
+ fi |
| 83 |
+ |
| 84 |
mycmakeargs+=( |
| 85 |
# normally copied from LLVM_INCLUDE_DOCS but the latter |
| 86 |
# is lacking value in stand-alone builds |
| 87 |
- -DCLANG_INCLUDE_DOCS=ON |
| 88 |
- -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON |
| 89 |
- -DLLVM_BUILD_DOCS=ON |
| 90 |
- -DLLVM_ENABLE_SPHINX=ON |
| 91 |
- -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 92 |
- -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 93 |
- -DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 94 |
+ -DCLANG_INCLUDE_DOCS=${build_docs} |
| 95 |
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} |
| 96 |
) |
| 97 |
else |
| 98 |
mycmakeargs+=( |
| 99 |
@@ -389,6 +401,7 @@ multilib_src_install_all() { |
| 100 |
fi |
| 101 |
|
| 102 |
docompress "/usr/lib/llvm/${SLOT}/share/man" |
| 103 |
+ llvm_install_manpages |
| 104 |
# match 'html' non-compression |
| 105 |
use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" |
| 106 |
# +x for some reason; TODO: investigate |
| 107 |
|
| 108 |
diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild |
| 109 |
index 9a815d36163..a66c3ab9739 100644 |
| 110 |
--- a/sys-devel/clang/clang-11.0.0.9999.ebuild |
| 111 |
+++ b/sys-devel/clang/clang-11.0.0.9999.ebuild |
| 112 |
@@ -10,6 +10,7 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \ |
| 113 |
DESCRIPTION="C language family frontend for LLVM" |
| 114 |
HOMEPAGE="https://llvm.org/" |
| 115 |
LLVM_COMPONENTS=( clang clang-tools-extra ) |
| 116 |
+LLVM_MANPAGES=build |
| 117 |
LLVM_TEST_COMPONENTS=( |
| 118 |
llvm/lib/Testing/Support |
| 119 |
llvm/utils/{lit,llvm-lit,unittest} |
| 120 |
@@ -44,8 +45,8 @@ RDEPEND=" |
| 121 |
${PYTHON_DEPS}" |
| 122 |
DEPEND="${RDEPEND}" |
| 123 |
BDEPEND=" |
| 124 |
- dev-python/sphinx |
| 125 |
>=dev-util/cmake-3.16 |
| 126 |
+ doc? ( dev-python/sphinx ) |
| 127 |
xml? ( virtual/pkgconfig ) |
| 128 |
${PYTHON_DEPS}" |
| 129 |
RDEPEND="${RDEPEND} |
| 130 |
@@ -112,7 +113,7 @@ check_distribution_components() { |
| 131 |
;; |
| 132 |
# conditional to USE=doc |
| 133 |
docs-clang-html|docs-clang-tools-html) |
| 134 |
- continue |
| 135 |
+ use doc || continue |
| 136 |
;; |
| 137 |
esac |
| 138 |
|
| 139 |
@@ -191,11 +192,15 @@ get_distribution_components() { |
| 140 |
find-all-symbols |
| 141 |
modularize |
| 142 |
pp-trace |
| 143 |
- |
| 144 |
- # manpages |
| 145 |
- docs-clang-man |
| 146 |
- docs-clang-tools-man |
| 147 |
) |
| 148 |
+ |
| 149 |
+ if llvm_are_manpages_built; then |
| 150 |
+ out+=( |
| 151 |
+ # manpages |
| 152 |
+ docs-clang-man |
| 153 |
+ docs-clang-tools-man |
| 154 |
+ ) |
| 155 |
+ fi |
| 156 |
|
| 157 |
use doc && out+=( |
| 158 |
docs-clang-html |
| 159 |
@@ -256,16 +261,23 @@ multilib_src_configure() { |
| 160 |
) |
| 161 |
|
| 162 |
if multilib_is_native_abi; then |
| 163 |
+ local build_docs=OFF |
| 164 |
+ if llvm_are_manpages_built; then |
| 165 |
+ build_docs=ON |
| 166 |
+ mycmakeargs+=( |
| 167 |
+ -DLLVM_BUILD_DOCS=ON |
| 168 |
+ -DLLVM_ENABLE_SPHINX=ON |
| 169 |
+ -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 170 |
+ -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 171 |
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 172 |
+ ) |
| 173 |
+ fi |
| 174 |
+ |
| 175 |
mycmakeargs+=( |
| 176 |
# normally copied from LLVM_INCLUDE_DOCS but the latter |
| 177 |
# is lacking value in stand-alone builds |
| 178 |
- -DCLANG_INCLUDE_DOCS=ON |
| 179 |
- -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON |
| 180 |
- -DLLVM_BUILD_DOCS=ON |
| 181 |
- -DLLVM_ENABLE_SPHINX=ON |
| 182 |
- -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 183 |
- -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 184 |
- -DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 185 |
+ -DCLANG_INCLUDE_DOCS=${build_docs} |
| 186 |
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} |
| 187 |
) |
| 188 |
else |
| 189 |
mycmakeargs+=( |
| 190 |
@@ -386,6 +398,7 @@ multilib_src_install_all() { |
| 191 |
fi |
| 192 |
|
| 193 |
docompress "/usr/lib/llvm/${SLOT}/share/man" |
| 194 |
+ llvm_install_manpages |
| 195 |
# match 'html' non-compression |
| 196 |
use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" |
| 197 |
# +x for some reason; TODO: investigate |
| 198 |
|
| 199 |
diff --git a/sys-devel/clang/clang-11.0.0.ebuild b/sys-devel/clang/clang-11.0.0.ebuild |
| 200 |
index ed86435d86e..facfef0b9a2 100644 |
| 201 |
--- a/sys-devel/clang/clang-11.0.0.ebuild |
| 202 |
+++ b/sys-devel/clang/clang-11.0.0.ebuild |
| 203 |
@@ -10,6 +10,7 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \ |
| 204 |
DESCRIPTION="C language family frontend for LLVM" |
| 205 |
HOMEPAGE="https://llvm.org/" |
| 206 |
LLVM_COMPONENTS=( clang clang-tools-extra ) |
| 207 |
+LLVM_MANPAGES=build |
| 208 |
LLVM_TEST_COMPONENTS=( |
| 209 |
llvm/lib/Testing/Support |
| 210 |
llvm/utils/{lit,llvm-lit,unittest} |
| 211 |
@@ -44,8 +45,8 @@ RDEPEND=" |
| 212 |
${PYTHON_DEPS}" |
| 213 |
DEPEND="${RDEPEND}" |
| 214 |
BDEPEND=" |
| 215 |
- dev-python/sphinx |
| 216 |
>=dev-util/cmake-3.16 |
| 217 |
+ doc? ( dev-python/sphinx ) |
| 218 |
xml? ( virtual/pkgconfig ) |
| 219 |
${PYTHON_DEPS}" |
| 220 |
RDEPEND="${RDEPEND} |
| 221 |
@@ -112,7 +113,7 @@ check_distribution_components() { |
| 222 |
;; |
| 223 |
# conditional to USE=doc |
| 224 |
docs-clang-html|docs-clang-tools-html) |
| 225 |
- continue |
| 226 |
+ use doc || continue |
| 227 |
;; |
| 228 |
esac |
| 229 |
|
| 230 |
@@ -191,11 +192,15 @@ get_distribution_components() { |
| 231 |
find-all-symbols |
| 232 |
modularize |
| 233 |
pp-trace |
| 234 |
- |
| 235 |
- # manpages |
| 236 |
- docs-clang-man |
| 237 |
- docs-clang-tools-man |
| 238 |
) |
| 239 |
+ |
| 240 |
+ if llvm_are_manpages_built; then |
| 241 |
+ out+=( |
| 242 |
+ # manpages |
| 243 |
+ docs-clang-man |
| 244 |
+ docs-clang-tools-man |
| 245 |
+ ) |
| 246 |
+ fi |
| 247 |
|
| 248 |
use doc && out+=( |
| 249 |
docs-clang-html |
| 250 |
@@ -256,16 +261,23 @@ multilib_src_configure() { |
| 251 |
) |
| 252 |
|
| 253 |
if multilib_is_native_abi; then |
| 254 |
+ local build_docs=OFF |
| 255 |
+ if llvm_are_manpages_built; then |
| 256 |
+ build_docs=ON |
| 257 |
+ mycmakeargs+=( |
| 258 |
+ -DLLVM_BUILD_DOCS=ON |
| 259 |
+ -DLLVM_ENABLE_SPHINX=ON |
| 260 |
+ -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 261 |
+ -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 262 |
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 263 |
+ ) |
| 264 |
+ fi |
| 265 |
+ |
| 266 |
mycmakeargs+=( |
| 267 |
# normally copied from LLVM_INCLUDE_DOCS but the latter |
| 268 |
# is lacking value in stand-alone builds |
| 269 |
- -DCLANG_INCLUDE_DOCS=ON |
| 270 |
- -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON |
| 271 |
- -DLLVM_BUILD_DOCS=ON |
| 272 |
- -DLLVM_ENABLE_SPHINX=ON |
| 273 |
- -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 274 |
- -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 275 |
- -DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 276 |
+ -DCLANG_INCLUDE_DOCS=${build_docs} |
| 277 |
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} |
| 278 |
) |
| 279 |
else |
| 280 |
mycmakeargs+=( |
| 281 |
@@ -386,6 +398,7 @@ multilib_src_install_all() { |
| 282 |
fi |
| 283 |
|
| 284 |
docompress "/usr/lib/llvm/${SLOT}/share/man" |
| 285 |
+ llvm_install_manpages |
| 286 |
# match 'html' non-compression |
| 287 |
use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" |
| 288 |
# +x for some reason; TODO: investigate |
| 289 |
|
| 290 |
diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild |
| 291 |
index 5d413abcc3e..c2935609f3f 100644 |
| 292 |
--- a/sys-devel/clang/clang-12.0.0.9999.ebuild |
| 293 |
+++ b/sys-devel/clang/clang-12.0.0.9999.ebuild |
| 294 |
@@ -10,6 +10,7 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \ |
| 295 |
DESCRIPTION="C language family frontend for LLVM" |
| 296 |
HOMEPAGE="https://llvm.org/" |
| 297 |
LLVM_COMPONENTS=( clang clang-tools-extra ) |
| 298 |
+LLVM_MANPAGES=build |
| 299 |
LLVM_TEST_COMPONENTS=( |
| 300 |
llvm/lib/Testing/Support |
| 301 |
llvm/utils/{lit,llvm-lit,unittest} |
| 302 |
@@ -44,8 +45,8 @@ RDEPEND=" |
| 303 |
${PYTHON_DEPS}" |
| 304 |
DEPEND="${RDEPEND}" |
| 305 |
BDEPEND=" |
| 306 |
- dev-python/sphinx |
| 307 |
>=dev-util/cmake-3.16 |
| 308 |
+ doc? ( dev-python/sphinx ) |
| 309 |
xml? ( virtual/pkgconfig ) |
| 310 |
${PYTHON_DEPS}" |
| 311 |
RDEPEND="${RDEPEND} |
| 312 |
@@ -110,7 +111,7 @@ check_distribution_components() { |
| 313 |
;; |
| 314 |
# conditional to USE=doc |
| 315 |
docs-clang-html|docs-clang-tools-html) |
| 316 |
- continue |
| 317 |
+ use doc || continue |
| 318 |
;; |
| 319 |
esac |
| 320 |
|
| 321 |
@@ -189,11 +190,15 @@ get_distribution_components() { |
| 322 |
find-all-symbols |
| 323 |
modularize |
| 324 |
pp-trace |
| 325 |
- |
| 326 |
- # manpages |
| 327 |
- docs-clang-man |
| 328 |
- docs-clang-tools-man |
| 329 |
) |
| 330 |
+ |
| 331 |
+ if llvm_are_manpages_built; then |
| 332 |
+ out+=( |
| 333 |
+ # manpages |
| 334 |
+ docs-clang-man |
| 335 |
+ docs-clang-tools-man |
| 336 |
+ ) |
| 337 |
+ fi |
| 338 |
|
| 339 |
use doc && out+=( |
| 340 |
docs-clang-html |
| 341 |
@@ -254,17 +259,21 @@ multilib_src_configure() { |
| 342 |
) |
| 343 |
|
| 344 |
if multilib_is_native_abi; then |
| 345 |
+ local build_docs=OFF |
| 346 |
+ if llvm_are_manpages_built; then |
| 347 |
+ build_docs=ON |
| 348 |
+ mycmakeargs+=( |
| 349 |
+ -DLLVM_BUILD_DOCS=ON |
| 350 |
+ -DLLVM_ENABLE_SPHINX=ON |
| 351 |
+ -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 352 |
+ -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 353 |
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 354 |
+ ) |
| 355 |
+ fi |
| 356 |
mycmakeargs+=( |
| 357 |
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra |
| 358 |
- # normally copied from LLVM_INCLUDE_DOCS but the latter |
| 359 |
- # is lacking value in stand-alone builds |
| 360 |
- -DCLANG_INCLUDE_DOCS=ON |
| 361 |
- -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON |
| 362 |
- -DLLVM_BUILD_DOCS=ON |
| 363 |
- -DLLVM_ENABLE_SPHINX=ON |
| 364 |
- -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 365 |
- -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 366 |
- -DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 367 |
+ -DCLANG_INCLUDE_DOCS=${build_docs} |
| 368 |
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} |
| 369 |
) |
| 370 |
else |
| 371 |
mycmakeargs+=( |
| 372 |
@@ -385,6 +394,7 @@ multilib_src_install_all() { |
| 373 |
fi |
| 374 |
|
| 375 |
docompress "/usr/lib/llvm/${SLOT}/share/man" |
| 376 |
+ llvm_install_manpages |
| 377 |
# match 'html' non-compression |
| 378 |
use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" |
| 379 |
# +x for some reason; TODO: investigate |
Archives