diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index e240671e..3fdbf7b2 100644 --- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch +++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch @@ -13,10 +13,10 @@ Subject: Use Debian-provided MathJax everywhere. polly/docs/doxygen.cfg.in | 2 +- 8 files changed, 14 insertions(+), 5 deletions(-) -Index: llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_9~svn363490/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/conf.py +--- llvm-toolchain-snapshot_9~svn363490.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_9~svn363490/clang-tools-extra/docs/conf.py @@ -123,6 +123,9 @@ html_theme = 'haiku' # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/conf.py # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_9~svn363490/clang-tools-extra/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang-tools-extra/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_9~svn363490.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_9~svn363490/clang-tools-extra/docs/doxygen.cfg.in @@ -1443,7 +1443,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -40,13 +40,13 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang-tools-extra/docs/doxygen.cfg.in # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_9~svn363490/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_9~svn351647/clang/docs/analyzer/conf.py +--- llvm-toolchain-snapshot_9~svn363490.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_9~svn363490/clang/docs/analyzer/conf.py @@ -123,6 +123,9 @@ html_theme = 'haiku' # so a file named "default.css" will overwrite the builtin "default.css". - html_static_path = ['_static'] + html_static_path = [] +# Use Debian-provided MathJax +mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' @@ -54,13 +54,13 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/analyzer/conf.py # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/conf.py +Index: llvm-toolchain-snapshot_9~svn363490/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_9~svn351647/clang/docs/conf.py +--- llvm-toolchain-snapshot_9~svn363490.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_9~svn363490/clang/docs/conf.py @@ -124,6 +124,9 @@ html_theme = 'haiku' # so a file named "default.css" will overwrite the builtin "default.css". - html_static_path = ['_static'] + html_static_path = [] +# Use Debian-provided MathJax +mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' @@ -68,10 +68,10 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/conf.py # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_9~svn363490/clang/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_9~svn351647/clang/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_9~svn363490.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_9~svn363490/clang/docs/doxygen.cfg.in @@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/docs/doxygen.cfg.in # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_9~svn351647/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_9~svn363490/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_9~svn351647/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_9~svn363490.orig/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_9~svn363490/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_9~svn351647/docs/doxygen.cfg.in # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_9~svn351647/polly/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_9~svn363490/polly/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/polly/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_9~svn351647/polly/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_9~svn363490.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_9~svn363490/polly/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff index 9fa2aeef..f1b7df82 100644 --- a/debian/patches/remove-apple-clang-manpage.diff +++ b/debian/patches/remove-apple-clang-manpage.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_9~svn362241/clang/docs/CommandGuide/clang.rst +Index: llvm-toolchain-snapshot_9~svn363490/clang/docs/CommandGuide/clang.rst =================================================================== ---- llvm-toolchain-snapshot_9~svn362241.orig/clang/docs/CommandGuide/clang.rst -+++ llvm-toolchain-snapshot_9~svn362241/clang/docs/CommandGuide/clang.rst +--- llvm-toolchain-snapshot_9~svn363490.orig/clang/docs/CommandGuide/clang.rst ++++ llvm-toolchain-snapshot_9~svn363490/clang/docs/CommandGuide/clang.rst @@ -310,20 +310,10 @@ Clang fully supports cross compilation a Depending on how your version of Clang is configured, it may have support for a number of cross compilers, or may only support a native target. @@ -21,10 +21,10 @@ Index: llvm-toolchain-snapshot_9~svn362241/clang/docs/CommandGuide/clang.rst - When building for iPhone OS, specify the minimum version supported by your - application. - - .. option:: -march= + .. option:: --print-supported-cpus - Specify that Clang should generate code for a specific processor family -@@ -616,11 +606,6 @@ ENVIRONMENT + Print out a list of supported processors for the given target (specified +@@ -622,11 +612,6 @@ ENVIRONMENT These environment variables specify additional paths, as for :envvar:`CPATH`, which are only used when processing the appropriate language.