Date: Tue, 25 Oct 2016 02:14:14 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424596 - in head/devel: llvm37/files llvm38/files llvm39/files Message-ID: <201610250214.u9P2EERr030954@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Oct 25 02:14:14 2016 New Revision: 424596 URL: https://svnweb.freebsd.org/changeset/ports/424596 Log: Apply a patch from upstream to (hopefully) fix a race in documentation builds. PR: 213619 Reported by: many Added: head/devel/llvm37/files/patch-svn-283188 (contents, props changed) head/devel/llvm38/files/patch-svn-283188 (contents, props changed) head/devel/llvm39/files/patch-svn-283188 (contents, props changed) Added: head/devel/llvm37/files/patch-svn-283188 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm37/files/patch-svn-283188 Tue Oct 25 02:14:14 2016 (r424596) @@ -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) Added: head/devel/llvm38/files/patch-svn-283188 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm38/files/patch-svn-283188 Tue Oct 25 02:14:14 2016 (r424596) @@ -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) Added: head/devel/llvm39/files/patch-svn-283188 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm39/files/patch-svn-283188 Tue Oct 25 02:14:14 2016 (r424596) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610250214.u9P2EERr030954>