[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/3.8.1/, sys-devel/llvm/, sys-devel/llvm/files/3.9.1/

[Michał Górny]

commit:     d36d66e6d8f8da372bc8b6dc23b69a69c8b84960
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 08:28:47 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 08:38:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36d66e6

sys-devel/llvm: Backport upstream Sphinx race fix to 3.9, #606858

It seems that we have only applied the patch fixing race condition
between LLVM Sphinx targets and not between clang's. To fix that, just
switch to the upstream patch that fixes both at the root.

 ...n-ordering-dep-between-HTML-man-Sphinx-ta.patch |  0
 ...eparate-doctrees-to-prevent-races-between.patch | 35 ++++++++++++++++++++++
 sys-devel/llvm/llvm-3.7.1-r3.ebuild                |  2 +-
 sys-devel/llvm/llvm-3.8.1-r2.ebuild                |  2 +-
 sys-devel/llvm/llvm-3.8.1.ebuild                   |  2 +-
 sys-devel/llvm/llvm-3.9.0-r1.ebuild                |  2 +-
 sys-devel/llvm/llvm-3.9.1-r1.ebuild                |  2 +-
 sys-devel/llvm/llvm-3.9.1.ebuild                   |  2 +-
 8 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
similarity index 100%
rename from sys-devel/llvm/files/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
rename to sys-devel/llvm/files/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch

diff --git a/sys-devel/llvm/files/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch b/sys-devel/llvm/files/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch
new file mode 100644
index 00000000..1e01e64
--- /dev/null
+++ b/sys-devel/llvm/files/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch
@@ -0,0 +1,35 @@
+From 40960f63616f62c8ac52eeeddf68bdb441b8be3e Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@g.o>
+Date: Tue, 4 Oct 2016 06:09:14 +0000
+Subject: [PATCH] [cmake] Use separate doctrees to prevent races between Sphinx
+ instances
+
+Use separate doctrees between different Sphinx builders in order to
+prevent race condition issues due to multiple Sphinx instances accessing
+the same doctree cache in parallel.
+
+Bug: https://llvm.org/bugs/show_bug.cgi?id=23781
+
+Differential Revision: https://reviews.llvm.org/D23755
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@283188 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ cmake/modules/AddSphinxTarget.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake
+index a968555aa06..ca9f4c38ffd 100644
+--- a/cmake/modules/AddSphinxTarget.cmake
++++ b/cmake/modules/AddSphinxTarget.cmake
+@@ -6,7 +6,7 @@
+ # ``project`` should be the project name
+ function (add_sphinx_target builder project)
+   set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${builder}")
+-  set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
++  set(SPHINX_DOC_TREE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-${builder}")
+   set(SPHINX_TARGET_NAME docs-${project}-${builder})
+ 
+   if (SPHINX_WARNINGS_AS_ERRORS)
+-- 
+2.11.0
+

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index b1e9ceb..edebcba 100644
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -167,7 +167,7 @@ src_prepare() {
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 5ba7822..fd640fc 100644
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -167,7 +167,7 @@ src_prepare() {
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341

diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index dcc8353..86a8fe9 100644
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -168,7 +168,7 @@ src_prepare() {
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341

diff --git a/sys-devel/llvm/llvm-3.9.0-r1.ebuild b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
index 814931b..f33c557 100644
--- a/sys-devel/llvm/llvm-3.9.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
@@ -178,7 +178,7 @@ src_prepare() {
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch
 
 	# Allow custom cmake build types (like 'Gentoo')
 	eapply "${FILESDIR}"/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch

diff --git a/sys-devel/llvm/llvm-3.9.1-r1.ebuild b/sys-devel/llvm/llvm-3.9.1-r1.ebuild
index 20bee28..5bae5d3 100644
--- a/sys-devel/llvm/llvm-3.9.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.1-r1.ebuild
@@ -178,7 +178,7 @@ src_prepare() {
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch
 
 	# Allow custom cmake build types (like 'Gentoo')
 	eapply "${FILESDIR}"/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch

diff --git a/sys-devel/llvm/llvm-3.9.1.ebuild b/sys-devel/llvm/llvm-3.9.1.ebuild
index 6fbfcd8..c24c19f 100644
--- a/sys-devel/llvm/llvm-3.9.1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.1.ebuild
@@ -178,7 +178,7 @@ src_prepare() {
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.9.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${FILESDIR}"/3.9.1/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch
 
 	# Allow custom cmake build types (like 'Gentoo')
 	eapply "${FILESDIR}"/3.9.1/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch