Commit 3ba855e9 authored by Nicholas Breen's avatar Nicholas Breen

detect sphinx-build --version output on both STDOUT and STDERR

parent 54b93469
...@@ -3,8 +3,10 @@ gromacs (2018.1-4) unstable; urgency=medium ...@@ -3,8 +3,10 @@ gromacs (2018.1-4) unstable; urgency=medium
* Additionally exclude MdrunUtilityMpiUnitTests on OpenMPI builds only, * Additionally exclude MdrunUtilityMpiUnitTests on OpenMPI builds only,
which fail erratically. which fail erratically.
* Set Rules-Requires-Root: no. * Set Rules-Requires-Root: no.
* patches/sphinx-version-detect.patch: permit identification of newer
versions of python-sphinx, which changed their --version output.
-- Nicholas Breen <nbreen@debian.org> Fri, 27 Apr 2018 16:27:51 -0700 -- Nicholas Breen <nbreen@debian.org> Sat, 28 Apr 2018 08:25:15 -0700
gromacs (2018.1-3) unstable; urgency=medium gromacs (2018.1-3) unstable; urgency=medium
......
...@@ -22,7 +22,7 @@ Build-Depends-Indep: doxygen, ...@@ -22,7 +22,7 @@ Build-Depends-Indep: doxygen,
graphviz, graphviz,
imagemagick, imagemagick,
mscgen, mscgen,
python-sphinx (>= 1.4.0), python-sphinx (>= 1.4.1),
rdfind, rdfind,
symlinks, symlinks,
texlive-fonts-recommended, texlive-fonts-recommended,
......
...@@ -5,3 +5,4 @@ doxygen.patch ...@@ -5,3 +5,4 @@ doxygen.patch
disable-cpuinfotest.patch disable-cpuinfotest.patch
hurd-disable-numa-test.patch hurd-disable-numa-test.patch
mdrun-test-timeout.patch mdrun-test-timeout.patch
sphinx-version-detect.patch
Description: Identify newer python-sphinx versions
In recent versions, "sphinx-build --version" changed its output format
and moved from STDOUT to STDERR.
Author: Nicholas Breen <nbreen@debian.org>
Origin: vendor
Last-Update: 2018-04-27
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: gromacs/cmake/FindSphinx.cmake
===================================================================
--- gromacs.orig/cmake/FindSphinx.cmake
+++ gromacs/cmake/FindSphinx.cmake
@@ -44,12 +44,13 @@ mark_as_advanced(SPHINX_EXECUTABLE)
if (SPHINX_EXECUTABLE AND NOT DEFINED SPHINX_EXECUTABLE_VERSION)
execute_process(
COMMAND ${SPHINX_EXECUTABLE} --version
+ ERROR_VARIABLE SPHINX_VERSION_OUTPUT_VARIABLE
OUTPUT_VARIABLE SPHINX_VERSION_OUTPUT_VARIABLE
RESULT_VARIABLE SPHINX_VERSION_RESULT_VARIABLE
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
- string(REGEX REPLACE "Sphinx \\([^)]*\\) ([^ ]+)" "\\1" SPHINX_EXECUTABLE_VERSION "${SPHINX_VERSION_OUTPUT_VARIABLE}")
+ string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" SPHINX_EXECUTABLE_VERSION "${SPHINX_VERSION_OUTPUT_VARIABLE}")
set(SPHINX_EXECUTABLE_VERSION "${SPHINX_EXECUTABLE_VERSION}" CACHE INTERNAL "Version of ${SPHINX_EXECUTABLE}")
endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment