Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 662047 Details for
Bug 733656
>=sys-devel/llvm-10.0.1, >=sys-devel/clang-10.0.1: Make dependency on dev-python/sphinx optional
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Move man-page building and dependencies behind USE="doc"
llvmebuild.patch (text/plain), 2.13 KB, created by
Hypoon
on 2020-09-23 04:42:32 UTC
(
hide
)
Description:
Move man-page building and dependencies behind USE="doc"
Filename:
MIME Type:
Creator:
Hypoon
Created:
2020-09-23 04:42:32 UTC
Size:
2.13 KB
patch
obsolete
>--- a/llvm-10.0.1.ebuild 2020-09-20 17:39:28.000000000 -0400 >+++ b/llvm-10.0.1.ebuild 2020-09-22 23:00:47.856963644 -0400 >@@ -58,11 +58,12 @@ > <sys-libs/libcxx-$(ver_cut 1-3).9999 > >=sys-devel/binutils-apple-5.1 > ) >- libffi? ( virtual/pkgconfig ) >- $(python_gen_any_dep ' >+ doc? ( $(python_gen_any_dep ' >+ dev-python/recommonmark[${PYTHON_USEDEP}] > dev-python/sphinx[${PYTHON_USEDEP}] >- doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) >- ')" >+ ') ) >+ libffi? ( virtual/pkgconfig ) >+ ${PYTHON_DEPS}" > # There are no file collisions between these versions but having :0 > # installed means llvm-config there will take precedence. > RDEPEND="${RDEPEND} >@@ -77,10 +78,9 @@ > ) > > python_check_deps() { >- if use doc; then >- has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || >- return 1 >- fi >+ use doc || return 0 >+ >+ has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && > has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" > } > >@@ -155,11 +155,6 @@ > # Update config.guess to support more systems > cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die > >- # manpages don't use markdown >- if ! use doc; then >- sed -i -e '/source_parsers/d' docs/conf.py || die >- fi >- > llvm.org_src_prepare > } > >@@ -275,13 +270,12 @@ > > # python modules > opt-viewer >+ ) > >- # manpages >+ use doc && out+=( > docs-dsymutil-man > docs-llvm-dwarfdump-man > docs-llvm-man >- ) >- use doc && out+=( > docs-llvm-html > ) > >@@ -363,11 +357,13 @@ > > if multilib_is_native_abi; then > mycmakeargs+=( >- -DLLVM_BUILD_DOCS=ON >+ -DLLVM_BUILD_DOCS=$(usex doc) > -DLLVM_ENABLE_OCAMLDOC=OFF >- -DLLVM_ENABLE_SPHINX=ON >+ -DLLVM_ENABLE_SPHINX=$(usex doc) > -DLLVM_ENABLE_DOXYGEN=OFF > -DLLVM_INSTALL_UTILS=ON >+ ) >+ use doc && mycmakeargs+=( > -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" > -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" > -DSPHINX_WARNINGS_AS_ERRORS=OFF >@@ -464,7 +460,9 @@ > LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" > _EOF_ > >- docompress "/usr/lib/llvm/${SLOT}/share/man" >+ if use doc; then >+ docompress "/usr/lib/llvm/${SLOT}/share/man" >+ fi > } > > pkg_postinst() {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 733656
: 662047