From 84cf3f9cd13845e3f27fa944bade8ee7dc41ce71 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 16 Jan 2019 15:40:45 +0100 Subject: [PATCH] patches updated to 9 --- .../patches/clang-analyzer-force-version.diff | 10 ++++---- debian/patches/clang-format-version.diff | 24 +++++++++---------- debian/patches/clang-tidy-run-bin.diff | 10 ++++---- debian/patches/fix-scan-view-path.diff | 4 ++-- ...ddversion-suffix-to-llvm-server-exec.patch | 6 ++--- debian/patches/lldb-libname.diff | 8 +++---- debian/patches/python-clangpath.diff | 8 +++---- debian/patches/scan-build-clang-path.diff | 10 ++++---- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index 78bcd0dc..818937e5 100644 --- a/debian/patches/clang-analyzer-force-version.diff +++ b/debian/patches/clang-analyzer-force-version.diff @@ -1,16 +1,16 @@ # Force the version of clang in the analyzer # This was causing the static analyzer to fail silently if the clang & clang++ are # not installed -Index: llvm-toolchain-snapshot_8~svn339515/clang/tools/scan-build/libexec/ccc-analyzer +Index: llvm-toolchain-snapshot_9~svn339515/clang/tools/scan-build/libexec/ccc-analyzer =================================================================== ---- llvm-toolchain-snapshot_8~svn339515.orig/clang/tools/scan-build/libexec/ccc-analyzer -+++ llvm-toolchain-snapshot_8~svn339515/clang/tools/scan-build/libexec/ccc-analyzer +--- llvm-toolchain-snapshot_9~svn339515.orig/clang/tools/scan-build/libexec/ccc-analyzer ++++ llvm-toolchain-snapshot_9~svn339515/clang/tools/scan-build/libexec/ccc-analyzer @@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/ if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } $Clang = $ENV{'CLANG_CXX'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-8'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-9'; } $IsCXX = 1 } @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_8~svn339515/clang/tools/scan-build/libexec/ccc-an $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-8'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-9'; } $IsCXX = 0 } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index bdd5652e..b5145d0c 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -4,42 +4,42 @@ clang/tools/clang-format/clang-format.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format-diff.py -+++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format-diff.py +--- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format-diff.py @@ -57,7 +57,7 @@ def main(): parser.add_argument('-style', help='formatting style to apply (LLVM, Google, Chromium, ' 'Mozilla, WebKit)') - parser.add_argument('-binary', default='clang-format', -+ parser.add_argument('-binary', default='clang-format-8', ++ parser.add_argument('-binary', default='clang-format-9', help='location of binary to use for clang-format') args = parser.parse_args() -Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format.el -+++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.el +--- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.el @@ -36,7 +36,7 @@ :group 'tools) (defcustom clang-format-executable - (or (executable-find "clang-format") -+ (or (executable-find "clang-format-8") ++ (or (executable-find "clang-format-9") "clang-format") "Location of the clang-format executable. -Index: llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_8~svn342269.orig/clang/tools/clang-format/clang-format.py -+++ llvm-toolchain-snapshot_8~svn342269/clang/tools/clang-format/clang-format.py +--- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.py @@ -36,7 +36,7 @@ import vim # set g:clang_format_path to the path to clang-format if it is not on the path # Change this to the full path if clang-format is not on the path. -binary = 'clang-format' -+binary = 'clang-format-8' ++binary = 'clang-format-9' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path') diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index 73933b3d..66c02867 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,17 +1,17 @@ -Index: llvm-toolchain-snapshot_8~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_9~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_8~svn342269.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_8~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +--- llvm-toolchain-snapshot_9~svn342269.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-snapshot_9~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py @@ -179,10 +179,10 @@ def main(): 'clang-tidy and clang-apply-replacements in ' '$PATH.') parser.add_argument('-clang-tidy-binary', metavar='PATH', - default='clang-tidy', -+ default='clang-tidy-8', ++ default='clang-tidy-9', help='path to clang-tidy binary') parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', - default='clang-apply-replacements', -+ default='clang-apply-replacements-8', ++ default='clang-apply-replacements-9', help='path to clang-apply-replacements binary') parser.add_argument('-checks', default=None, help='checks filter, when not specified, use clang-tidy ' diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff index 1f953808..1038b8db 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -2,11 +2,11 @@ Index: llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view =================================================================== --- llvm-toolchain-3.9-3.9.orig/clang/tools/scan-view/bin/scan-view +++ llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view -@@ -23,6 +23,7 @@ kDefaultPort = 8181 +@@ -23,6 +23,7 @@ kDefaultPort = 9191 kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-8' ++BASE_DIR = '/usr/share/clang/scan-view-9' def url_is_up(url): diff --git a/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch index 598deb5d..7e8e267a 100644 --- a/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch +++ b/debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch @@ -12,10 +12,10 @@ which could then break something else. This probably should have upstream bug but I couldn't find any existing report. -Index: llvm-toolchain-snapshot_8~svn349668/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_9~svn349669/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- llvm-toolchain-snapshot_8~svn349668.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -+++ llvm-toolchain-snapshot_8~svn349668/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +--- llvm-toolchain-snapshot_9~svn349669.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_9~svn349669/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -33,13 +33,14 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff index 5621ce3f..26969f9b 100644 --- a/debian/patches/lldb-libname.diff +++ b/debian/patches/lldb-libname.diff @@ -2,16 +2,16 @@ lldb/scripts/Python/finishSwigPythonLLDB.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py +Index: llvm-toolchain-snapshot_9~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py =================================================================== ---- llvm-toolchain-snapshot_8~svn339515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py -+++ llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py +--- llvm-toolchain-snapshot_9~svn339515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py ++++ llvm-toolchain-snapshot_9~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py @@ -443,7 +443,7 @@ def make_symlink_liblldb( if eOSType == utilsOsType.EnumOsType.Darwin: strLibFileExtn = ".dylib" else: - strLibFileExtn = ".so" -+ strLibFileExtn = "-8.so" ++ strLibFileExtn = "-9.so" strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn) bOk, strErrMsg = make_symlink( diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index db8a9d79..605c07ae 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -2,16 +2,16 @@ clang/bindings/python/clang/cindex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_8~svn342269/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-snapshot_9~svn342269/clang/bindings/python/clang/cindex.py =================================================================== ---- llvm-toolchain-snapshot_8~svn342269.orig/clang/bindings/python/clang/cindex.py -+++ llvm-toolchain-snapshot_8~svn342269/clang/bindings/python/clang/cindex.py +--- llvm-toolchain-snapshot_9~svn342269.orig/clang/bindings/python/clang/cindex.py ++++ llvm-toolchain-snapshot_9~svn342269/clang/bindings/python/clang/cindex.py @@ -4144,7 +4144,7 @@ class Config: elif name == 'Windows': file = 'libclang.dll' else: - file = 'libclang.so' -+ file = 'libclang-8.so' ++ file = 'libclang-9.so' if Config.library_path: file = Config.library_path + '/' + file diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index d1e1e224..2eccb0fa 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -2,16 +2,16 @@ clang/tools/scan-build/bin/scan-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_8~svn349138/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_9~svn349139/clang/tools/scan-build/bin/scan-build =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-snapshot_8~svn349138/clang/tools/scan-build/bin/scan-build -@@ -1468,7 +1468,7 @@ sub FindClang { +--- llvm-toolchain-snapshot_9~svn349139.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_9~svn349139/clang/tools/scan-build/bin/scan-build +@@ -1469,7 +1469,7 @@ sub FindClang { if (!defined $Options{AnalyzerDiscoveryMethod}) { $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); if (!defined $Clang || ! -x $Clang) { - $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang"); -+ $Clang = Cwd::realpath("/usr/lib/llvm-8/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-9/bin/clang"); } if (!defined $Clang || ! -x $Clang) { return "error: Cannot find an executable 'clang' relative to" .