proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 11:41:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refresh of the patches

Browse Source
This commit is contained in:
Sylvestre Ledru 2015-01-14 19:00:08 +00:00
parent eca342bc68
commit d13c6243a3
4 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-form
# 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-3.6'
+binary = 'clang-format-3.7'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-form
# Change this to the full path if clang-format is not on the path.
-binary = 'clang-format'
+binary = 'clang-format-3.6'
+binary = 'clang-format-3.7'
def main():
@ -33,7 +33,7 @@ Index: llvm-toolchain-snapshot_3.6~svn225450/clang/tools/clang-format/clang-form
(defcustom clang-format-executable
- (or (executable-find "clang-format")
+ (or (executable-find "clang-format-3.6")
+ (or (executable-find "clang-format-3.7")
"clang-format")
"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'
else:
- file = 'libclang.so'
+ file = 'libclang-3.6.so'
+ file = 'libclang-3.7.so'
if Config.library_path:
file = Config.library_path + '/' + file

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

@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build
# Find 'clang'
if (!defined $AnalyzerDiscoveryMethod) {
- $Clang = Cwd::realpath("$RealBin/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-3.6/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-3.7/bin/clang");
if (!defined $Clang || ! -x $Clang) {
$Clang = Cwd::realpath("$RealBin/clang");
}

37
debian/patches/strip-svn.diff vendored
View File

@ -1,49 +1,40 @@
Index: llvm-toolchain-snapshot_3.6~svn222952/autoconf/configure.ac
Index: llvm-toolchain-snapshot_3.7~svn226019/autoconf/configure.ac
===================================================================
--- llvm-toolchain-snapshot_3.6~svn222952.orig/autoconf/configure.ac
+++ llvm-toolchain-snapshot_3.6~svn222952/autoconf/configure.ac
--- llvm-toolchain-snapshot_3.7~svn226019.orig/autoconf/configure.ac
+++ llvm-toolchain-snapshot_3.7~svn226019/autoconf/configure.ac
@@ -32,12 +32,12 @@ dnl===----------------------------------
dnl Initialize autoconf and define the package name, version number and
dnl address for reporting bugs.
-AC_INIT([LLVM],[3.6.0svn],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.6.0],[http://llvm.org/bugs/])
-AC_INIT([LLVM],[3.7.0svn],[http://llvm.org/bugs/])
+AC_INIT([LLVM],[3.7.0],[http://llvm.org/bugs/])
LLVM_VERSION_MAJOR=3
LLVM_VERSION_MINOR=6
LLVM_VERSION_MINOR=7
LLVM_VERSION_PATCH=0
-LLVM_VERSION_SUFFIX=svn
+LLVM_VERSION_SUFFIX=
AC_DEFINE_UNQUOTED([LLVM_VERSION_MAJOR], $LLVM_VERSION_MAJOR, [Major version of the LLVM API])
AC_DEFINE_UNQUOTED([LLVM_VERSION_MINOR], $LLVM_VERSION_MINOR, [Minor version of the LLVM API])
Index: llvm-toolchain-snapshot_3.6~svn222952/configure
Index: llvm-toolchain-snapshot_3.7~svn226019/configure
===================================================================
--- llvm-toolchain-snapshot_3.6~svn222952.orig/configure
+++ llvm-toolchain-snapshot_3.6~svn222952/configure
--- llvm-toolchain-snapshot_3.7~svn226019.orig/configure
+++ llvm-toolchain-snapshot_3.7~svn226019/configure
@@ -561,8 +561,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='LLVM'
PACKAGE_TARNAME='llvm'
-PACKAGE_VERSION='3.6.0svn'
-PACKAGE_STRING='LLVM 3.6.0svn'
+PACKAGE_VERSION='3.6.0'
+PACKAGE_STRING='LLVM 3.6.0'
-PACKAGE_VERSION='3.7.0svn'
-PACKAGE_STRING='LLVM 3.7.0svn'
+PACKAGE_VERSION='3.7.0'
+PACKAGE_STRING='LLVM 3.7.0'
PACKAGE_BUGREPORT='http://llvm.org/bugs/'
ac_unique_file="lib/IR/Module.cpp"
@@ -1314,7 +1314,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures LLVM 3.6.0svn to adapt to many kinds of systems.
+\`configure' configures LLVM 3.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1923,7 +1923,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
LLVM_VERSION_MAJOR=3
LLVM_VERSION_MINOR=6
LLVM_VERSION_MINOR=7
LLVM_VERSION_PATCH=0
-LLVM_VERSION_SUFFIX=svn
+LLVM_VERSION_SUFFIX=