summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-09-23 13:21:42 +0200
committerMichał Górny <mgorny@gentoo.org>2016-09-23 13:23:33 +0200
commitc8349494bc758d16a47de730e13057aff602e3f4 (patch)
tree4c145743e565c26de34e11cb34ae659eb0dfbe50 /sys-devel
parentapp-backup/bacula: Maintenance release (diff)
downloadgentoo-c8349494bc758d16a47de730e13057aff602e3f4.tar.gz
gentoo-c8349494bc758d16a47de730e13057aff602e3f4.tar.bz2
gentoo-c8349494bc758d16a47de730e13057aff602e3f4.zip
sys-devel/llvm: Update for the Sphinx install dir patch applied upstream
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/llvm/llvm-9999.ebuild6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 12c96833db84..4c8d6da5ab84 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -92,10 +92,6 @@ src_prepare() {
# Fix libdir for ocaml bindings install, bug #559134
eapply "${FILESDIR}"/9999/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
- # Make it possible to override Sphinx HTML install dirs
- # https://llvm.org/bugs/show_bug.cgi?id=23780
- eapply "${FILESDIR}"/9999/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
-
# Prevent race conditions with parallel Sphinx runs
# https://llvm.org/bugs/show_bug.cgi?id=23781
eapply "${FILESDIR}"/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
@@ -190,7 +186,7 @@ multilib_src_configure() {
-DLLVM_INSTALL_UTILS=ON
)
use doc && mycmakeargs+=(
- -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+ -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-DSPHINX_WARNINGS_AS_ERRORS=OFF
)
use gold && mycmakeargs+=(