summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-10-04 08:40:23 +0200
committerMichał Górny <mgorny@gentoo.org>2016-10-04 08:41:48 +0200
commit38ecce6a3e34cfcb6b056550e34974e863226dc7 (patch)
tree952a6c229cf8f15cba2590404f9b6683b68c2f11 /sys-devel
parentsys-devel/llvm: SOVERSIONs have been fixed upst, backport new to 3.9.0 (diff)
downloadgentoo-38ecce6a3e34cfcb6b056550e34974e863226dc7.tar.gz
gentoo-38ecce6a3e34cfcb6b056550e34974e863226dc7.tar.bz2
gentoo-38ecce6a3e34cfcb6b056550e34974e863226dc7.zip
sys-devel/clang: Sphinx race conditions fixed upstream
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/clang/clang-9999.ebuild2
-rw-r--r--sys-devel/clang/files/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch27
2 files changed, 0 insertions, 29 deletions
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 59d178c0f040..3015cf407882 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -115,8 +115,6 @@ src_unpack() {
src_prepare() {
python_setup
- # fix race condition between sphinx targets
- eapply "${FILESDIR}"/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch
# automatically select active system GCC's libraries, bugs #406163 and #417913
# TODO: cross-linux tests broken by this one
eapply "${FILESDIR}"/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch
diff --git a/sys-devel/clang/files/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch b/sys-devel/clang/files/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch
deleted file mode 100644
index 35fc19da9847..000000000000
--- a/sys-devel/clang/files/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ec16b3f76a26a3a10b0272d012b306963fa93013 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 21 Aug 2016 23:24:19 +0200
-Subject: [PATCH 1/7] cmake: Add ordering dep between HTML Sphinx docs and
- manpages
-
----
- docs/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 13b79fdf..bd75b63 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -102,6 +102,9 @@ if (LLVM_ENABLE_SPHINX)
- endif()
- if (${SPHINX_OUTPUT_MAN})
- add_sphinx_target(man clang)
-+ if (${SPHINX_OUTPUT_HTML})
-+ add_dependencies(docs-clang-html docs-clang-man)
-+ endif()
- endif()
- endif()
- endif()
---
-2.9.3
-