mirror of
https://github.com/rust-lang/rust
synced 2024-09-15 14:40:45 +00:00
auto merge of #10222 : nibrahim/rust/docfix, r=brson
Earlier versions of pandoc don't have the `default.html5` template file. When `make docs` is run, the build process fails with this message. pandoc: doc/rust.html pandoc: /usr/share/pandoc-1.8.2.1/templates/default.html5: openFile: does not exist (No such file or directory) node.js:201 throw e; // process.nextTick error, or 'error' event on first tick ^ Error: write EPIPE at errnoException (net.js:670:11) at Object.afterWrite [as oncomplete] (net.js:503:19) make: *** [doc/rust.html] Error 1
This commit is contained in:
commit
2456272626
6
configure
vendored
6
configure
vendored
|
@ -463,12 +463,14 @@ then
|
||||||
# extract the first 2 version fields, ignore everything else
|
# extract the first 2 version fields, ignore everything else
|
||||||
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
|
sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
|
||||||
|
|
||||||
|
MIN_PV_MAJOR="1"
|
||||||
|
MIN_PV_MINOR="9"
|
||||||
# these patterns are shell globs, *not* regexps
|
# these patterns are shell globs, *not* regexps
|
||||||
PV_MAJOR=${PV_MAJOR_MINOR% *}
|
PV_MAJOR=${PV_MAJOR_MINOR% *}
|
||||||
PV_MINOR=${PV_MAJOR_MINOR#* }
|
PV_MINOR=${PV_MAJOR_MINOR#* }
|
||||||
if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
|
if [ "$PV_MAJOR" -lt "$MIN_PV_MAJOR" ] || [ "$PV_MINOR" -lt "$MIN_PV_MINOR" ]
|
||||||
then
|
then
|
||||||
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
|
step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. Need at least $MIN_PV_MAJOR.$MIN_PV_MINOR. Disabling"
|
||||||
BAD_PANDOC=1
|
BAD_PANDOC=1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue