From b80d7440f3e73f502744c3b4b5bbde62a4927cf3 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Tue, 4 Oct 2016 08:22:05 +0200 Subject: sys-devel/llvm: Sphinx race condition has been fixed upstream --- ...n-ordering-dep-between-HTML-man-Sphinx-ta.patch | 33 ++++++++++++++++++++++ ...n-ordering-dep-between-HTML-man-Sphinx-ta.patch | 33 ---------------------- 2 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 sys-devel/llvm/files/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch delete mode 100644 sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch (limited to 'sys-devel/llvm/files') diff --git a/sys-devel/llvm/files/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch new file mode 100644 index 000000000000..94a81574d6ee --- /dev/null +++ b/sys-devel/llvm/files/3.9.0/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch @@ -0,0 +1,33 @@ +From 2f798e87c10a93235a00e95c38e736f9ff7e991b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Mon, 8 Jun 2015 14:29:03 +0200 +Subject: [PATCH 04/10] cmake: Add an ordering dep between HTML & man Sphinx + targets + +Add a dependency between HTML & manpage Sphinx targets to prevent two +instances of Sphinx from running in parallel, and therefore solves race +conditions reusing the same doctree directory. + +Bug: https://llvm.org/bugs/show_bug.cgi?id=23781 +Patch: https://reviews.llvm.org/D23755 +--- + docs/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index f2cd7e9..179a65b 100644 +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt +@@ -109,6 +109,9 @@ if (LLVM_ENABLE_SPHINX) + + if (${SPHINX_OUTPUT_MAN}) + add_sphinx_target(man llvm) ++ if (${SPHINX_OUTPUT_HTML}) ++ add_dependencies(docs-llvm-html docs-llvm-man) ++ endif() + endif() + + endif() +-- +2.9.3 + diff --git a/sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch deleted file mode 100644 index 94a81574d6ee..000000000000 --- a/sys-devel/llvm/files/9999/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2f798e87c10a93235a00e95c38e736f9ff7e991b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 8 Jun 2015 14:29:03 +0200 -Subject: [PATCH 04/10] cmake: Add an ordering dep between HTML & man Sphinx - targets - -Add a dependency between HTML & manpage Sphinx targets to prevent two -instances of Sphinx from running in parallel, and therefore solves race -conditions reusing the same doctree directory. - -Bug: https://llvm.org/bugs/show_bug.cgi?id=23781 -Patch: https://reviews.llvm.org/D23755 ---- - docs/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index f2cd7e9..179a65b 100644 ---- a/docs/CMakeLists.txt -+++ b/docs/CMakeLists.txt -@@ -109,6 +109,9 @@ if (LLVM_ENABLE_SPHINX) - - if (${SPHINX_OUTPUT_MAN}) - add_sphinx_target(man llvm) -+ if (${SPHINX_OUTPUT_HTML}) -+ add_dependencies(docs-llvm-html docs-llvm-man) -+ endif() - endif() - - endif() --- -2.9.3 - -- cgit v1.2.3-65-gdbad