diff options
author | brooks <brooks@FreeBSD.org> | 2016-10-25 10:14:14 +0800 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2016-10-25 10:14:14 +0800 |
commit | 5b4227a00ac40460440dae86d785d51246713b8d (patch) | |
tree | aeb6c6d2219b26d9f1d08de533544a78d2494724 /devel | |
parent | 300302cfa2a941d25bee9e1e4767d3b2b387310d (diff) | |
download | freebsd-ports-gnome-5b4227a00ac40460440dae86d785d51246713b8d.tar.gz freebsd-ports-gnome-5b4227a00ac40460440dae86d785d51246713b8d.tar.zst freebsd-ports-gnome-5b4227a00ac40460440dae86d785d51246713b8d.zip |
Apply a patch from upstream to (hopefully) fix a race in documentation
builds.
PR: 213619
Reported by: many
Diffstat (limited to 'devel')
-rw-r--r-- | devel/llvm37/files/patch-svn-283188 | 26 | ||||
-rw-r--r-- | devel/llvm38/files/patch-svn-283188 | 26 | ||||
-rw-r--r-- | devel/llvm39/files/patch-svn-283188 | 26 |
3 files changed, 78 insertions, 0 deletions
diff --git a/devel/llvm37/files/patch-svn-283188 b/devel/llvm37/files/patch-svn-283188 new file mode 100644 index 000000000000..43f29670192b --- /dev/null +++ b/devel/llvm37/files/patch-svn-283188 @@ -0,0 +1,26 @@ +------------------------------------------------------------------------ +r283188 | mgorny | 2016-10-04 06:09:14 +0000 (Tue, 04 Oct 2016) | 9 lines + +[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 +------------------------------------------------------------------------ +Index: cmake/modules/AddSphinxTarget.cmake +=================================================================== +--- cmake/modules/AddSphinxTarget.cmake (revision 283187) ++++ cmake/modules/AddSphinxTarget.cmake (revision 283188) +@@ -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) diff --git a/devel/llvm38/files/patch-svn-283188 b/devel/llvm38/files/patch-svn-283188 new file mode 100644 index 000000000000..43f29670192b --- /dev/null +++ b/devel/llvm38/files/patch-svn-283188 @@ -0,0 +1,26 @@ +------------------------------------------------------------------------ +r283188 | mgorny | 2016-10-04 06:09:14 +0000 (Tue, 04 Oct 2016) | 9 lines + +[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 +------------------------------------------------------------------------ +Index: cmake/modules/AddSphinxTarget.cmake +=================================================================== +--- cmake/modules/AddSphinxTarget.cmake (revision 283187) ++++ cmake/modules/AddSphinxTarget.cmake (revision 283188) +@@ -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) diff --git a/devel/llvm39/files/patch-svn-283188 b/devel/llvm39/files/patch-svn-283188 new file mode 100644 index 000000000000..43f29670192b --- /dev/null +++ b/devel/llvm39/files/patch-svn-283188 @@ -0,0 +1,26 @@ +------------------------------------------------------------------------ +r283188 | mgorny | 2016-10-04 06:09:14 +0000 (Tue, 04 Oct 2016) | 9 lines + +[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 +------------------------------------------------------------------------ +Index: cmake/modules/AddSphinxTarget.cmake +=================================================================== +--- cmake/modules/AddSphinxTarget.cmake (revision 283187) ++++ cmake/modules/AddSphinxTarget.cmake (revision 283188) +@@ -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) |