sys-devel/clang: Sphinx race conditions fixed upstream
authorMichał Górny <mgorny@gentoo.org>
Tue, 4 Oct 2016 06:40:23 +0000 (08:40 +0200)
committerMichał Górny <mgorny@gentoo.org>
Tue, 4 Oct 2016 06:41:48 +0000 (08:41 +0200)
sys-devel/clang/clang-9999.ebuild
sys-devel/clang/files/9999/0001-cmake-Add-ordering-dep-between-HTML-Sphinx-docs-and-.patch [deleted file]

index 59d178c0f0407c982f40a2e081fb7b5f2d610673..3015cf407882e6716acf6b7247fc7aa3c6fe2502 100644 (file)
@@ -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 (file)
index 35fc19d..0000000
+++ /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
-