proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-14 20:00:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

patches updated to 9

Browse Source
This commit is contained in:
Sylvestre Ledru 2019-01-16 15:40:45 +01:00
parent be346973e5
commit 84cf3f9cd1
8 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/patches/clang-analyzer-force-version.diff vendored
View File

@ -1,16 +1,16 @@
# Force the version of clang in the analyzer # Force the version of clang in the analyzer
# This was causing the static analyzer to fail silently if the clang & clang++ are # This was causing the static analyzer to fail silently if the clang & clang++ are
# not installed # 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_9~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/clang/tools/scan-build/libexec/ccc-analyzer
@@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/ @@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
$Clang = $ENV{'CLANG_CXX'}; $Clang = $ENV{'CLANG_CXX'};
- if (!defined $Clang || ! -x $Clang) { $Clang = '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 = 1 $IsCXX = 1
} }
@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_8~svn339515/clang/tools/scan-build/libexec/ccc-an
$Clang = $ENV{'CLANG'}; $Clang = $ENV{'CLANG'};
- if (!defined $Clang || ! -x $Clang) { $Clang = '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 $IsCXX = 0
} }

24
debian/patches/clang-format-version.diff vendored
View File

@ -4,42 +4,42 @@
clang/tools/clang-format/clang-format.py | 2 +- clang/tools/clang-format/clang-format.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-) 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_9~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/clang/tools/clang-format/clang-format-diff.py
@@ -57,7 +57,7 @@ def main(): @@ -57,7 +57,7 @@ def main():
parser.add_argument('-style', parser.add_argument('-style',
help='formatting style to apply (LLVM, Google, Chromium, ' help='formatting style to apply (LLVM, Google, Chromium, '
'Mozilla, WebKit)') 'Mozilla, WebKit)')
- parser.add_argument('-binary', default='clang-format', - 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') help='location of binary to use for clang-format')
args = parser.parse_args() 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_9~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/clang/tools/clang-format/clang-format.el
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
:group 'tools) :group 'tools)
(defcustom clang-format-executable (defcustom clang-format-executable
- (or (executable-find "clang-format") - (or (executable-find "clang-format")
+ (or (executable-find "clang-format-8") + (or (executable-find "clang-format-9")
"clang-format") "clang-format")
"Location of the clang-format executable. "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_9~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/clang/tools/clang-format/clang-format.py
@@ -36,7 +36,7 @@ import vim @@ -36,7 +36,7 @@ import vim
# set g:clang_format_path to the path to clang-format if it is not on the path # 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. # Change this to the full path if clang-format is not on the path.
-binary = 'clang-format' -binary = 'clang-format'
+binary = 'clang-format-8' +binary = 'clang-format-9'
if vim.eval('exists("g:clang_format_path")') == "1": if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path') binary = vim.eval('g:clang_format_path')

10
debian/patches/clang-tidy-run-bin.diff vendored
View File

@ -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_9~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/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -179,10 +179,10 @@ def main(): @@ -179,10 +179,10 @@ def main():
'clang-tidy and clang-apply-replacements in ' 'clang-tidy and clang-apply-replacements in '
'$PATH.') '$PATH.')
parser.add_argument('-clang-tidy-binary', metavar='PATH', parser.add_argument('-clang-tidy-binary', metavar='PATH',
- default='clang-tidy', - default='clang-tidy',
+ default='clang-tidy-8', + default='clang-tidy-9',
help='path to clang-tidy binary') help='path to clang-tidy binary')
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
- default='clang-apply-replacements', - default='clang-apply-replacements',
+ default='clang-apply-replacements-8', + default='clang-apply-replacements-9',
help='path to clang-apply-replacements binary') help='path to clang-apply-replacements binary')
parser.add_argument('-checks', default=None, parser.add_argument('-checks', default=None,
help='checks filter, when not specified, use clang-tidy ' help='checks filter, when not specified, use clang-tidy '

4
debian/patches/fix-scan-view-path.diff vendored
View File

@ -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.orig/clang/tools/scan-view/bin/scan-view
+++ llvm-toolchain-3.9-3.9/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 kMaxPortsToTry = 100
### ###
+BASE_DIR = '/usr/share/clang/scan-view-8' +BASE_DIR = '/usr/share/clang/scan-view-9'
def url_is_up(url): def url_is_up(url):

6
debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch vendored
View File

@ -12,10 +12,10 @@ which could then break something else.
This probably should have upstream bug but I couldn't find any existing report. 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_9~svn349669.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/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -33,13 +33,14 @@ @@ -33,13 +33,14 @@
#include "lldb/Utility/StreamString.h" #include "lldb/Utility/StreamString.h"
#include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallString.h"

8
debian/patches/lldb-libname.diff vendored
View File

@ -2,16 +2,16 @@
lldb/scripts/Python/finishSwigPythonLLDB.py | 2 +- lldb/scripts/Python/finishSwigPythonLLDB.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 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_9~svn339515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ llvm-toolchain-snapshot_8~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py +++ llvm-toolchain-snapshot_9~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -443,7 +443,7 @@ def make_symlink_liblldb( @@ -443,7 +443,7 @@ def make_symlink_liblldb(
if eOSType == utilsOsType.EnumOsType.Darwin: if eOSType == utilsOsType.EnumOsType.Darwin:
strLibFileExtn = ".dylib" strLibFileExtn = ".dylib"
else: else:
- strLibFileExtn = ".so" - strLibFileExtn = ".so"
+ strLibFileExtn = "-8.so" + strLibFileExtn = "-9.so"
strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn) strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink( bOk, strErrMsg = make_symlink(

8
debian/patches/python-clangpath.diff vendored
View File

@ -2,16 +2,16 @@
clang/bindings/python/clang/cindex.py | 2 +- clang/bindings/python/clang/cindex.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 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_9~svn342269.orig/clang/bindings/python/clang/cindex.py
+++ llvm-toolchain-snapshot_8~svn342269/clang/bindings/python/clang/cindex.py +++ llvm-toolchain-snapshot_9~svn342269/clang/bindings/python/clang/cindex.py
@@ -4144,7 +4144,7 @@ class Config: @@ -4144,7 +4144,7 @@ class Config:
elif name == 'Windows': elif name == 'Windows':
file = 'libclang.dll' file = 'libclang.dll'
else: else:
- file = 'libclang.so' - file = 'libclang.so'
+ file = 'libclang-8.so' + file = 'libclang-9.so'
if Config.library_path: if Config.library_path:
file = Config.library_path + '/' + file file = Config.library_path + '/' + file

10
debian/patches/scan-build-clang-path.diff vendored
View File

@ -2,16 +2,16 @@
clang/tools/scan-build/bin/scan-build | 2 +- clang/tools/scan-build/bin/scan-build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 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_9~svn349139.orig/clang/tools/scan-build/bin/scan-build
+++ llvm-toolchain-snapshot_8~svn349138/clang/tools/scan-build/bin/scan-build +++ llvm-toolchain-snapshot_9~svn349139/clang/tools/scan-build/bin/scan-build
@@ -1468,7 +1468,7 @@ sub FindClang { @@ -1469,7 +1469,7 @@ sub FindClang {
if (!defined $Options{AnalyzerDiscoveryMethod}) { if (!defined $Options{AnalyzerDiscoveryMethod}) {
$Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
if (!defined $Clang || ! -x $Clang) { if (!defined $Clang || ! -x $Clang) {
- $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/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) { if (!defined $Clang || ! -x $Clang) {
return "error: Cannot find an executable 'clang' relative to" . return "error: Cannot find an executable 'clang' relative to" .