commit: bdd127d7bda87af3ecd35ebfaa8fcca80be3f690
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 10:14:28 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 10:21:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd127d7
sys-devel/clang: Always build manpages from source
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-devel/clang/clang-10.0.1.9999.ebuild | 22 +++++++++++++++-------
sys-devel/clang/clang-10.0.1_rc1.ebuild | 22 +++++++++++++++-------
sys-devel/clang/clang-11.0.0.9999.ebuild | 18 +++++++++++-------
3 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/sys-devel/clang/clang-10.0.1.9999.ebuild
b/sys-devel/clang/clang-10.0.1.9999.ebuild
index 874112003a9..ead9436be91 100644
--- a/sys-devel/clang/clang-10.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.1.9999.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
${PYTHON_DEPS}"
DEPEND="${RDEPEND}"
BDEPEND="
- doc? ( dev-python/sphinx )
+ dev-python/sphinx
xml? ( virtual/pkgconfig )
${PYTHON_DEPS}"
RDEPEND="${RDEPEND}
@@ -112,6 +112,14 @@ check_distribution_components() {
clang*|findAllSymbols)
continue
;;
+ # headers for clang-tidy static library
+ clang-tidy-headers)
+ continue
+ ;;
+ # conditional to USE=doc
+ docs-clang-html|docs-clang-tools-html)
+ continue
+ ;;
esac
all_targets+=( "${l}" )
@@ -190,13 +198,15 @@ get_distribution_components() {
find-all-symbols
modularize
pp-trace
+
+ # manpages
+ docs-clang-man
+ docs-clang-tools-man
)
use doc && out+=(
docs-clang-html
- docs-clang-man
docs-clang-tools-html
- docs-clang-tools-man
)
use static-analyzer && out+=(
@@ -253,10 +263,8 @@ multilib_src_configure() {
mycmakeargs+=(
# normally copied from LLVM_INCLUDE_DOCS but the latter
# is lacking value in stand-alone builds
- -DCLANG_INCLUDE_DOCS=$(usex doc)
- -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
- )
- use doc && mycmakeargs+=(
+ -DCLANG_INCLUDE_DOCS=ON
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON
-DLLVM_BUILD_DOCS=ON
-DLLVM_ENABLE_SPHINX=ON
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
diff --git a/sys-devel/clang/clang-10.0.1_rc1.ebuild
b/sys-devel/clang/clang-10.0.1_rc1.ebuild
index e7e3d86f94f..358e8d2cf56 100644
--- a/sys-devel/clang/clang-10.0.1_rc1.ebuild
+++ b/sys-devel/clang/clang-10.0.1_rc1.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
${PYTHON_DEPS}"
DEPEND="${RDEPEND}"
BDEPEND="
- doc? ( dev-python/sphinx )
+ dev-python/sphinx
xml? ( virtual/pkgconfig )
${PYTHON_DEPS}"
RDEPEND="${RDEPEND}
@@ -112,6 +112,14 @@ check_distribution_components() {
clang*|findAllSymbols)
continue
;;
+ # headers for clang-tidy static library
+ clang-tidy-headers)
+ continue
+ ;;
+ # conditional to USE=doc
+ docs-clang-html|docs-clang-tools-html)
+ continue
+ ;;
esac
all_targets+=( "${l}" )
@@ -190,13 +198,15 @@ get_distribution_components() {
find-all-symbols
modularize
pp-trace
+
+ # manpages
+ docs-clang-man
+ docs-clang-tools-man
)
use doc && out+=(
docs-clang-html
- docs-clang-man
docs-clang-tools-html
- docs-clang-tools-man
)
use static-analyzer && out+=(
@@ -253,10 +263,8 @@ multilib_src_configure() {
mycmakeargs+=(
# normally copied from LLVM_INCLUDE_DOCS but the latter
# is lacking value in stand-alone builds
- -DCLANG_INCLUDE_DOCS=$(usex doc)
- -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
- )
- use doc && mycmakeargs+=(
+ -DCLANG_INCLUDE_DOCS=ON
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON
-DLLVM_BUILD_DOCS=ON
-DLLVM_ENABLE_SPHINX=ON
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild
b/sys-devel/clang/clang-11.0.0.9999.ebuild
index 714dc5bb8c4..bb9f7504344 100644
--- a/sys-devel/clang/clang-11.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-11.0.0.9999.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
${PYTHON_DEPS}"
DEPEND="${RDEPEND}"
BDEPEND="
- doc? ( dev-python/sphinx )
+ dev-python/sphinx
xml? ( virtual/pkgconfig )
${PYTHON_DEPS}"
RDEPEND="${RDEPEND}
@@ -111,6 +111,10 @@ check_distribution_components() {
clang-tidy-headers)
continue
;;
+ # conditional to USE=doc
+ docs-clang-html|docs-clang-tools-html)
+ continue
+ ;;
esac
all_targets+=( "${l}" )
@@ -189,13 +193,15 @@ get_distribution_components() {
find-all-symbols
modularize
pp-trace
+
+ # manpages
+ docs-clang-man
+ docs-clang-tools-man
)
use doc && out+=(
docs-clang-html
- docs-clang-man
docs-clang-tools-html
- docs-clang-tools-man
)
use static-analyzer && out+=(
@@ -252,10 +258,8 @@ multilib_src_configure() {
mycmakeargs+=(
# normally copied from LLVM_INCLUDE_DOCS but the latter
# is lacking value in stand-alone builds
- -DCLANG_INCLUDE_DOCS=$(usex doc)
- -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
- )
- use doc && mycmakeargs+=(
+ -DCLANG_INCLUDE_DOCS=ON
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON
-DLLVM_BUILD_DOCS=ON
-DLLVM_ENABLE_SPHINX=ON
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
