diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index 07b76900..e87071d7 100644 --- a/debian/patches/clang-analyzer-force-version.diff +++ b/debian/patches/clang-analyzer-force-version.diff @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan $Clang = $ENV{'CLANG_CXX'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-16'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-17'; } $IsCXX = 1 } @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-16'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-17'; } $IsCXX = 0 } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 4e34cee9..a4c98fdb 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clan '-style=file, but can not find the .clang-format' 'file to use.') - parser.add_argument('-binary', default='clang-format', -+ parser.add_argument('-binary', default='clang-format-16', ++ parser.add_argument('-binary', default='clang-format-17', help='location of binary to use for clang-format') args = parser.parse_args() @@ -26,7 +26,7 @@ Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clan (defcustom clang-format-executable - (or (executable-find "clang-format") -+ (or (executable-find "clang-format-16") ++ (or (executable-find "clang-format-17") "clang-format") "Location of the clang-format executable. diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index 1c6ac5ad..aeaa9447 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -6,10 +6,10 @@ Index: llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extr action='store_true', help='allow alpha checkers from ' 'clang-analyzer.') parser.add_argument('-clang-tidy-binary', metavar='PATH', -+ default='clang-tidy-16', ++ default='clang-tidy-17', help='path to clang-tidy binary') parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', -+ default='clang-apply-replacements-16', ++ default='clang-apply-replacements-17', 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 af85272e..1566f5a0 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -6,7 +6,7 @@ Index: llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan- kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-16' ++BASE_DIR = '/usr/share/clang/scan-view-17' def url_is_up(url): diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 5ccbb830..2c2571f8 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/bindings/p file = 'libclang.dll' else: - file = 'libclang.so' -+ file = 'libclang-16.so' ++ file = 'libclang-17.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 1470d4c6..083bff48 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan $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-16/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-17/bin/clang"); if (!defined $Clang || ! -x $Clang) { # When an Xcode toolchain is present, look for a clang in the sibling bin # of the parent of the bin directory. So if scan-build is at diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff index 0cda8a2d..22a6dfca 100644 --- a/debian/patches/scan-build-py-fix-default-bin.diff +++ b/debian/patches/scan-build-py-fix-default-bin.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan metavar='', dest='clang', - default='clang', -+ default='clang-16', ++ default='clang-17', help="""'%(prog)s' uses the 'clang' executable relative to itself for static analysis. One can override this behavior with this option by using the 'clang' packaged with Xcode (on OS X) or from the PATH.""")