diff options
| -rw-r--r-- | sys-devel/clang/clang-4.0.1.ebuild | 2 | ||||
| -rw-r--r-- | sys-devel/clang/clang-5.0.9999.ebuild | 12 | ||||
| -rw-r--r-- | sys-devel/clang/clang-9999.ebuild | 17 | ||||
| -rw-r--r-- | sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch (renamed from sys-devel/clang/files/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch) | 0 |
4 files changed, 13 insertions, 18 deletions
diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild index e50f7ce0dc22..1acc0234ffde 100644 --- a/sys-devel/clang/clang-4.0.1.ebuild +++ b/sys-devel/clang/clang-4.0.1.ebuild @@ -93,7 +93,7 @@ src_prepare() { eapply "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch # fix stand-alone doc build - eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch + eapply "${FILESDIR}"/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch # fix value of ATOMIC_*_LOCK_FREE # (backport, temporary reverted upstream because of FreeBSD issues) diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild index 3b0cc5003f00..cca162d183ae 100644 --- a/sys-devel/clang/clang-5.0.9999.ebuild +++ b/sys-devel/clang/clang-5.0.9999.ebuild @@ -105,9 +105,6 @@ src_prepare() { # fix finding compiler-rt libs eapply "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch - # fix stand-alone doc build - eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch - # User patches eapply_user } @@ -152,11 +149,14 @@ multilib_src_configure() { if multilib_is_native_abi; then mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) - -DLLVM_ENABLE_SPHINX=$(usex doc) - -DLLVM_ENABLE_DOXYGEN=OFF + # 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+=( + -DLLVM_BUILD_DOCS=ON + -DLLVM_ENABLE_SPHINX=ON -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" -DSPHINX_WARNINGS_AS_ERRORS=OFF diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 5b40e22d5a54..9b2159f8fd96 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -102,14 +102,6 @@ src_unpack() { git-r3_checkout "${EGIT_REPO_URI}" "${S}" } -src_prepare() { - # fix stand-alone doc build - eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch - - # User patches - eapply_user -} - multilib_src_configure() { local llvm_version=$(llvm-config --version) || die local clang_version=$(get_version_component_range 1-3 "${llvm_version}") @@ -150,11 +142,14 @@ multilib_src_configure() { if multilib_is_native_abi; then mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) - -DLLVM_ENABLE_SPHINX=$(usex doc) - -DLLVM_ENABLE_DOXYGEN=OFF + # 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+=( + -DLLVM_BUILD_DOCS=ON + -DLLVM_ENABLE_SPHINX=ON -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" -DSPHINX_WARNINGS_AS_ERRORS=OFF diff --git a/sys-devel/clang/files/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch b/sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch index 0ecd5bc0e8c1..0ecd5bc0e8c1 100644 --- a/sys-devel/clang/files/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch +++ b/sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch |