mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-07-27 11:41:39 +00:00
update of patch which didn't update 17 => 18
This commit is contained in:
parent
bf2d3ab712
commit
15a65a89f8
@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan
|
|||||||
|
|
||||||
$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++-17'; }
|
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-18'; }
|
||||||
|
|
||||||
$IsCXX = 1
|
$IsCXX = 1
|
||||||
}
|
}
|
||||||
@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan
|
|||||||
|
|
||||||
$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-17'; }
|
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-18'; }
|
||||||
|
|
||||||
$IsCXX = 0
|
$IsCXX = 0
|
||||||
}
|
}
|
||||||
|
6
debian/patches/clang-format-version.diff
vendored
6
debian/patches/clang-format-version.diff
vendored
@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan
|
|||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"-binary",
|
"-binary",
|
||||||
- default="clang-format",
|
- default="clang-format",
|
||||||
+ default="clang-format-17",
|
+ default="clang-format-18",
|
||||||
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()
|
||||||
@ -26,7 +26,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan
|
|||||||
|
|
||||||
(defcustom clang-format-executable
|
(defcustom clang-format-executable
|
||||||
- (or (executable-find "clang-format")
|
- (or (executable-find "clang-format")
|
||||||
+ (or (executable-find "clang-format-17")
|
+ (or (executable-find "clang-format-18")
|
||||||
"clang-format")
|
"clang-format")
|
||||||
"Location of the clang-format executable.
|
"Location of the clang-format executable.
|
||||||
|
|
||||||
@ -39,7 +39,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clan
|
|||||||
# 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-17"
|
+binary = "clang-format-18"
|
||||||
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")
|
||||||
|
|
||||||
|
4
debian/patches/clang-tidy-run-bin.diff
vendored
4
debian/patches/clang-tidy-run-bin.diff
vendored
@ -8,12 +8,12 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extr
|
|||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
- "-clang-tidy-binary", metavar="PATH", help="path to clang-tidy binary"
|
- "-clang-tidy-binary", metavar="PATH", help="path to clang-tidy binary"
|
||||||
+ "-clang-tidy-binary", metavar="PATH",
|
+ "-clang-tidy-binary", metavar="PATH",
|
||||||
+ default='clang-tidy-17',
|
+ default='clang-tidy-18',
|
||||||
+ help="path to clang-tidy binary"
|
+ help="path to clang-tidy binary"
|
||||||
)
|
)
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"-clang-apply-replacements-binary",
|
"-clang-apply-replacements-binary",
|
||||||
+ default='clang-apply-replacements-17',
|
+ default='clang-apply-replacements-18',
|
||||||
metavar="PATH",
|
metavar="PATH",
|
||||||
help="path to clang-apply-replacements binary",
|
help="path to clang-apply-replacements binary",
|
||||||
)
|
)
|
||||||
|
2
debian/patches/fix-scan-view-path.diff
vendored
2
debian/patches/fix-scan-view-path.diff
vendored
@ -6,7 +6,7 @@ Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-
|
|||||||
kMaxPortsToTry = 100
|
kMaxPortsToTry = 100
|
||||||
|
|
||||||
###
|
###
|
||||||
+BASE_DIR = '/usr/share/clang/scan-view-17'
|
+BASE_DIR = '/usr/share/clang/scan-view-18'
|
||||||
|
|
||||||
|
|
||||||
def url_is_up(url):
|
def url_is_up(url):
|
||||||
|
2
debian/patches/python-clangpath.diff
vendored
2
debian/patches/python-clangpath.diff
vendored
@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/p
|
|||||||
file = "libclang.dll"
|
file = "libclang.dll"
|
||||||
else:
|
else:
|
||||||
- file = "libclang.so"
|
- file = "libclang.so"
|
||||||
+ file = "libclang-17.so"
|
+ file = "libclang-18.so"
|
||||||
|
|
||||||
if Config.library_path:
|
if Config.library_path:
|
||||||
file = Config.library_path + "/" + file
|
file = Config.library_path + "/" + file
|
||||||
|
2
debian/patches/scan-build-clang-path.diff
vendored
2
debian/patches/scan-build-clang-path.diff
vendored
@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan
|
|||||||
$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-17/bin/clang");
|
+ $Clang = Cwd::realpath("/usr/lib/llvm-18/bin/clang");
|
||||||
if (!defined $Clang || ! -x $Clang) {
|
if (!defined $Clang || ! -x $Clang) {
|
||||||
# When an Xcode toolchain is present, look for a clang in the sibling bin
|
# 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
|
# of the parent of the bin directory. So if scan-build is at
|
||||||
|
@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan
|
|||||||
metavar="<path>",
|
metavar="<path>",
|
||||||
dest="clang",
|
dest="clang",
|
||||||
- default="clang",
|
- default="clang",
|
||||||
+ default="clang-17",
|
+ default="clang-18",
|
||||||
help="""'%(prog)s' uses the 'clang' executable relative to itself for
|
help="""'%(prog)s' uses the 'clang' executable relative to itself for
|
||||||
static analysis. One can override this behavior with this option by
|
static analysis. One can override this behavior with this option by
|
||||||
using the 'clang' packaged with Xcode (on OS X) or from the PATH.""",
|
using the 'clang' packaged with Xcode (on OS X) or from the PATH.""",
|
||||||
|
Loading…
Reference in New Issue
Block a user