* revert-sphinx-deprecation.diff: revert the sphinx update as it breaks debian

buster
This commit is contained in:
Sylvestre Ledru 2020-06-21 10:25:24 +02:00
parent 854e98a9b5
commit 5be391cd2c
3 changed files with 58 additions and 2 deletions

18
debian/changelog vendored
View File

@ -1,4 +1,4 @@
llvm-toolchain-snapshot (1:11~++20200416103106+997f33cfeec-1~exp1) UNRELEASED; urgency=medium
llvm-toolchain-snapshot (1:11~++20200617103614+2eaadfc4fe6-1~exp1) UNRELEASED; urgency=medium
* experimental New snapshot release
* Add -DLLVM_POLLY_LINK_INTO_TOOLS=OFF to workaround
@ -10,8 +10,10 @@ llvm-toolchain-snapshot (1:11~++20200416103106+997f33cfeec-1~exp1) UNRELEASED; u
broke clangd-atomic-cmake.patch causing some undef symbol on
i386 and atomic
* Also install ompt-multiplex.h in libomp-X-dev
* revert-sphinx-deprecation.diff: revert the sphinx update as it breaks debian
buster
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 16 Apr 2020 10:34:32 +0200
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 17 Jun 2020 22:39:16 +0200
llvm-toolchain-snapshot (1:11~++20200410111154+35052267023-1~exp1) experimental; urgency=medium
@ -25,6 +27,18 @@ llvm-toolchain-snapshot (1:11~++20200410111154+35052267023-1~exp1) experimental;
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 11 Apr 2020 12:03:35 +0200
llvm-toolchain-snapshot (1:11~++20200409051253+d08105482e1-1~exp1) experimental; urgency=medium
* New snapshot release
* Bring back libc++-experimental
* remove no-cgi.patch - applied upstream
* Also install liblldMachO2.a in liblld
* Reoder the cmake arg
* Update the copyright file with recent changes (Closes: #956287)
Thanks to Michael Lustfield for the detective work
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 09 Apr 2020 17:21:05 +0200
llvm-toolchain-snapshot (1:11~++20200307074845+ec1d1f6ae70-1~exp1) experimental; urgency=medium
[ Sylvestre Ledru ]

View File

@ -0,0 +1,41 @@
commit 9989e81679580012054811d9106345fcde68c11f
Author: Jonas Devlieghere <jonas@devlieghere.com>
Date: Thu Jun 18 14:04:34 2020 -0700
[Sphinx] Adjust for source_parsers deprecation in Sphinx 3.0
Update the Sphinx configuration for the removal of source_parsers in
Sphinx 3.0. The variable has been deprecated since version 1.8.
> Version 1.8 deprecates and version 3.0 removes the source_parsers
> configuration variable that was used by older recommonmark versions.
https://www.sphinx-doc.org/en/master/usage/markdown.html
Differential revision: https://reviews.llvm.org/D75284
diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py
index c92ede3ea44..13bbc826de8 100644
--- a/llvm/docs/conf.py
+++ b/llvm/docs/conf.py
@@ -26,15 +26,16 @@ from datetime import date
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo']
+extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo', 'recommonmark']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
# The suffix of source filenames.
-source_suffix = ['.rst', '.md']
-
-source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
+source_suffix = {
+ '.rst': 'restructuredtext',
+ '.md': 'markdown',
+}
# The encoding of source files.
#source_encoding = 'utf-8-sig'

View File

@ -140,3 +140,4 @@ no-z3.patch
python3-shebang.patch
print-lldb-path.patch
revert-sphinx-deprecation.diff