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

fix the other hardcoded declarations + automate that

Browse Source
This commit is contained in:
Sylvestre Ledru 2015-08-11 13:02:25 +00:00
parent d1846d7938
commit a93c138df4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer
$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++-3.7'; } + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-3.8'; }
$IsCXX = 1 $IsCXX = 1
} }
@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer
$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-3.7'; } + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-3.8'; }
$IsCXX = 0 $IsCXX = 0
} }

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

@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-form
# 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-3.7' +binary = 'clang-format-3.8'
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')
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-form
# 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-3.7' +binary = 'clang-format-3.8'
def main(): def main():
@ -33,7 +33,7 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-form
(defcustom clang-format-executable (defcustom clang-format-executable
- (or (executable-find "clang-format") - (or (executable-find "clang-format")
+ (or (executable-find "clang-format-3.7") + (or (executable-find "clang-format-3.8")
"clang-format") "clang-format")
"Location of the clang-format executable. "Location of the clang-format executable.

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

@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/bindings/python/clang/cindex.
file = 'libclang.dll' file = 'libclang.dll'
else: else:
- file = 'libclang.so' - file = 'libclang.so'
+ file = 'libclang-3.7.so' + file = 'libclang-3.8.so'
if Config.library_path: if Config.library_path:
file = Config.library_path + '/' + file file = Config.library_path + '/' + file

2
debian/prepare-new-release.sh vendored
View File

@ -9,7 +9,7 @@ for F in $LIST; do
TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"` TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"`
svn mv $F $TARGET svn mv $F $TARGET
done done
LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules` LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff`
for F in $LIST; do for F in $LIST; do
sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F
sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F