| 1 |
commit: 8fc0c0d6535fed2ee17729761475df0ed46c963b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 30 14:30:03 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 30 14:32:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc0c0d6 |
| 7 |
|
| 8 |
sys-devel/clang: Remove unnecessary Sphinx patch from 5.0.0+ |
| 9 |
|
| 10 |
The Sphinx patch is no longer necessary with 5.0.0+ -- the upstream |
| 11 |
changes made it possible to get the docs building through passing a few |
| 12 |
variables to CMake. |
| 13 |
|
| 14 |
sys-devel/clang/clang-4.0.1.ebuild | 2 +- |
| 15 |
sys-devel/clang/clang-5.0.9999.ebuild | 12 ++++++------ |
| 16 |
sys-devel/clang/clang-9999.ebuild | 17 ++++++----------- |
| 17 |
...e-Support-stand-alone-Sphinx-doxygen-doc-build.patch | 0 |
| 18 |
4 files changed, 13 insertions(+), 18 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild |
| 21 |
index e50f7ce0dc2..1acc0234ffd 100644 |
| 22 |
--- a/sys-devel/clang/clang-4.0.1.ebuild |
| 23 |
+++ b/sys-devel/clang/clang-4.0.1.ebuild |
| 24 |
@@ -93,7 +93,7 @@ src_prepare() { |
| 25 |
eapply "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch |
| 26 |
|
| 27 |
# fix stand-alone doc build |
| 28 |
- eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch |
| 29 |
+ eapply "${FILESDIR}"/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch |
| 30 |
|
| 31 |
# fix value of ATOMIC_*_LOCK_FREE |
| 32 |
# (backport, temporary reverted upstream because of FreeBSD issues) |
| 33 |
|
| 34 |
diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild |
| 35 |
index 3b0cc5003f0..cca162d183a 100644 |
| 36 |
--- a/sys-devel/clang/clang-5.0.9999.ebuild |
| 37 |
+++ b/sys-devel/clang/clang-5.0.9999.ebuild |
| 38 |
@@ -105,9 +105,6 @@ src_prepare() { |
| 39 |
# fix finding compiler-rt libs |
| 40 |
eapply "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch |
| 41 |
|
| 42 |
- # fix stand-alone doc build |
| 43 |
- eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch |
| 44 |
- |
| 45 |
# User patches |
| 46 |
eapply_user |
| 47 |
} |
| 48 |
@@ -152,11 +149,14 @@ multilib_src_configure() { |
| 49 |
|
| 50 |
if multilib_is_native_abi; then |
| 51 |
mycmakeargs+=( |
| 52 |
- -DLLVM_BUILD_DOCS=$(usex doc) |
| 53 |
- -DLLVM_ENABLE_SPHINX=$(usex doc) |
| 54 |
- -DLLVM_ENABLE_DOXYGEN=OFF |
| 55 |
+ # normally copied from LLVM_INCLUDE_DOCS but the latter |
| 56 |
+ # is lacking value in stand-alone builds |
| 57 |
+ -DCLANG_INCLUDE_DOCS=$(usex doc) |
| 58 |
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc) |
| 59 |
) |
| 60 |
use doc && mycmakeargs+=( |
| 61 |
+ -DLLVM_BUILD_DOCS=ON |
| 62 |
+ -DLLVM_ENABLE_SPHINX=ON |
| 63 |
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 64 |
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 65 |
-DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 66 |
|
| 67 |
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild |
| 68 |
index 5b40e22d5a5..9b2159f8fd9 100644 |
| 69 |
--- a/sys-devel/clang/clang-9999.ebuild |
| 70 |
+++ b/sys-devel/clang/clang-9999.ebuild |
| 71 |
@@ -102,14 +102,6 @@ src_unpack() { |
| 72 |
git-r3_checkout "${EGIT_REPO_URI}" "${S}" |
| 73 |
} |
| 74 |
|
| 75 |
-src_prepare() { |
| 76 |
- # fix stand-alone doc build |
| 77 |
- eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch |
| 78 |
- |
| 79 |
- # User patches |
| 80 |
- eapply_user |
| 81 |
-} |
| 82 |
- |
| 83 |
multilib_src_configure() { |
| 84 |
local llvm_version=$(llvm-config --version) || die |
| 85 |
local clang_version=$(get_version_component_range 1-3 "${llvm_version}") |
| 86 |
@@ -150,11 +142,14 @@ multilib_src_configure() { |
| 87 |
|
| 88 |
if multilib_is_native_abi; then |
| 89 |
mycmakeargs+=( |
| 90 |
- -DLLVM_BUILD_DOCS=$(usex doc) |
| 91 |
- -DLLVM_ENABLE_SPHINX=$(usex doc) |
| 92 |
- -DLLVM_ENABLE_DOXYGEN=OFF |
| 93 |
+ # normally copied from LLVM_INCLUDE_DOCS but the latter |
| 94 |
+ # is lacking value in stand-alone builds |
| 95 |
+ -DCLANG_INCLUDE_DOCS=$(usex doc) |
| 96 |
+ -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc) |
| 97 |
) |
| 98 |
use doc && mycmakeargs+=( |
| 99 |
+ -DLLVM_BUILD_DOCS=ON |
| 100 |
+ -DLLVM_ENABLE_SPHINX=ON |
| 101 |
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 102 |
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" |
| 103 |
-DSPHINX_WARNINGS_AS_ERRORS=OFF |
| 104 |
|
| 105 |
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 |
| 106 |
similarity index 100% |
| 107 |
rename from sys-devel/clang/files/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch |
| 108 |
rename to sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch |
Archives