diff --git a/debian/changelog b/debian/changelog index 8dd13165..e1b6799d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-snapshot (1:4.0~svn275970-1~exp1) experimental; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Tue, 19 Jul 2016 14:26:05 +0200 + llvm-toolchain-snapshot (1:3.9~svn275968-1~exp1) experimental; urgency=medium * New snapshot release diff --git a/debian/control b/debian/control index 0615965a..7f56283a 100644 --- a/debian/control +++ b/debian/control @@ -10,22 +10,22 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, libjsoncpp-dev, lcov, procps, help2man, dh-ocaml, zlib1g-dev Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, - libllvm-3.9-ocaml-dev -Standards-Version: 3.9.8 + libllvm-4.0-ocaml-dev +Standards-Version: 4.0.8 Homepage: http://www.llvm.org/ Vcs-Svn: svn://anonscm.debian.org/svn/pkg-llvm/llvm-toolchain/branches/snapshot/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/snapshot/ # ------------- clang ------------- -Package: clang-3.9 +Package: clang-4.0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-common-3.9-dev (= ${binary:Version}), - libclang1-3.9 (= ${binary:Version}), libc6-dev, binutils + libclang-common-4.0-dev (= ${binary:Version}), + libclang1-4.0 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-3.9-dev, python -Suggests: gnustep, gnustep-devel, clang-3.9-doc +Recommends: llvm-4.0-dev, python +Suggests: gnustep, gnustep-devel, clang-4.0-doc Replaces: clang-3.1, clang-3.2, clang-3.3, clang-3.4 (<< 1:3.4.2-7~exp1), clang-3.5 (<< 1:3.5~+rc1-3~exp1), compiler-rt Breaks: clang-3.1, clang-3.2, clang-3.3, @@ -39,7 +39,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) well as the upcoming C++14 standard, and some parts of the fledgling C++1z standard, and is considered a production-quality C++ compiler. -Package: clang-format-3.9 +Package: clang-format-4.0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python Replaces: clang-format-3.3 @@ -56,11 +56,11 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: clang-tidy-3.9 +Package: clang-tidy-4.0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python -Replaces: clang-modernize-3.9, clang-3.9 (<< 1:3.9~svn250696-1) -Breaks: clang-modernize-3.9, clang-3.9 (<< 1:3.9~svn250696-1) +Replaces: clang-modernize-4.0, clang-4.0 (<< 1:4.0~svn250696-1) +Breaks: clang-modernize-4.0, clang-4.0 (<< 1:4.0~svn250696-1) Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming errors, like style violations, interface misuse, or bugs that can be deduced @@ -68,7 +68,7 @@ Description: clang-based C++ linter tool for writing new checks. -Package: clang-3.9-doc +Package: clang-4.0-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -83,7 +83,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation . This package contains the documentation. -Package: libclang1-3.9 +Package: libclang1-4.0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs} Pre-Depends: ${misc:Pre-Depends} @@ -105,12 +105,12 @@ Description: C interface to the clang library locations with elements within the AST, and other facilities that support Clang-based development tools. -Package: libclang1-3.9-dbg +Package: libclang1-4.0-dbg Architecture: any Multi-Arch: same Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-3.9 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-4.0 (= ${binary:Version}) Description: clang library Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -122,11 +122,11 @@ Description: clang library . This package contains the debugging symbols. -Package: libclang-3.9-dev +Package: libclang-4.0-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang1-3.9 (= ${binary:Version}), libclang-common-3.9-dev (= ${binary:Version}) + libclang1-4.0 (= ${binary:Version}), libclang-common-4.0-dev (= ${binary:Version}) Description: clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -137,12 +137,12 @@ Description: clang library - Development package standard, and is considered a production-quality C++ compiler. . This package contains the clang headers to develop extensions over - libclang1-3.9. + libclang1-4.0. -Package: libclang-common-3.9-dev +Package: libclang-common-4.0-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}) Description: clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end for the LLVM compiler. Its goal is to offer a replacement to the GNU Compiler @@ -156,7 +156,7 @@ Description: clang library - Common development package (profiling, etc). -Package: python-clang-3.9 +Package: python-clang-4.0 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python @@ -174,7 +174,7 @@ Description: Clang Python Bindings This binding package provides access to the Clang compiler and libraries. -Package: clang-3.9-examples +Package: clang-4.0-examples Architecture: any Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -191,7 +191,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm3.9 +Package: libllvm4.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -204,11 +204,11 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: libllvm3.9-dbg +Package: libllvm4.0-dbg Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: Modular compiler and toolchain technologies, debugging libraries @@ -218,11 +218,11 @@ Description: Modular compiler and toolchain technologies, debugging libraries . This package contains the LLVM runtime library debug symbols. -Package: llvm-3.9 +Package: llvm-4.0 Architecture: any -Suggests: llvm-3.9-doc -Depends: llvm-3.9-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-3.9-dev +Suggests: llvm-4.0-doc +Depends: llvm-4.0-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-4.0-dev Description: Modular compiler and toolchain technologies LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -246,7 +246,7 @@ Description: Modular compiler and toolchain technologies a young scheme front-end, and Java support is in development. LLVM can generate code for X86, SparcV9, PowerPC or many other architectures. -Package: llvm-3.9-runtime +Package: llvm-4.0-runtime Architecture: any Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} Conflicts: llvm (<< 2.7-1) @@ -267,10 +267,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-3.9-dev +Package: llvm-4.0-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends}, - llvm-3.9 (= ${binary:Version}), libtinfo-dev + llvm-4.0 (= ${binary:Version}), libtinfo-dev Replaces: llvm (<< 2.2-3) Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build @@ -288,11 +288,11 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: libllvm-3.9-ocaml-dev +Package: libllvm-4.0-ocaml-dev Section: ocaml Architecture: any -Suggests: llvm-3.9-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.9-dev (= ${binary:Version}) +Suggests: llvm-4.0-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-4.0-dev (= ${binary:Version}) Provides: ${ocaml:Provides} Description: Modular compiler and toolchain technologies, OCaml bindings LLVM is a collection of libraries and tools that make it easy to build @@ -309,7 +309,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-3.9-doc +Package: llvm-4.0-doc Section: doc Architecture: all Depends: ${misc:Depends}, libjs-jquery, libjs-underscore @@ -328,10 +328,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-3.9-examples +Package: llvm-4.0-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-3.9-dev (>= ${source:Version}), llvm-3.9-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-4.0-dev (>= ${source:Version}), llvm-4.0-dev (<< ${source:Version}+c~) Description: Modular compiler and toolchain technologies, examples LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -351,20 +351,20 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- -# Package: lld-3.9 +# Package: lld-4.0 # Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel # # ia64 mips mipsel hurd powerpc ppc64el have been removed -# Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}), llvm-3.9-dev +# Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}), llvm-4.0-dev # Pre-Depends: ${misc:Pre-Depends} # Description: LLVM-based linker # LLD is a new, high-performance linker. It is built as a set of reusable # components which highly leverage existing libraries in the larger LLVM # Project. -# Package: liblld-3.9 +# Package: liblld-4.0 # Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel # # ia64 mips mipsel hurd powerpc ppc64el have been removed -# Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}) +# Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}) # Pre-Depends: ${misc:Pre-Depends} # Section: libs # Description: LLVM-based linker, library @@ -374,10 +374,10 @@ Description: Modular compiler and toolchain technologies, examples # . # This package contains the LLD runtime library. -# Package: liblld-3.9-dbg +# Package: liblld-4.0-dbg # Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel # # ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed -# Depends: ${shlibs:Depends}, ${misc:Depends}, liblld-3.9 (= ${binary:Version}) +# Depends: ${shlibs:Depends}, ${misc:Depends}, liblld-4.0 (= ${binary:Version}) # Pre-Depends: ${misc:Pre-Depends} # Section: debug # Priority: extra @@ -389,11 +389,11 @@ Description: Modular compiler and toolchain technologies, examples # This package contains the LLD runtime library debug symbols. -# Package: liblld-3.9-dev +# Package: liblld-4.0-dev # Section: libdevel # Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel # # ia64 mips mipsel hurd powerpc ppc64el have been removed -# Depends: ${shlibs:Depends}, ${misc:Depends}, lld-3.9 (= ${binary:Version}) +# Depends: ${shlibs:Depends}, ${misc:Depends}, lld-4.0 (= ${binary:Version}) # Pre-Depends: ${misc:Pre-Depends} # Description: LLVM-based linker, header files # LLD is a new, high-performance linker. It is built as a set of reusable @@ -405,11 +405,11 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lldb ------------- -Package: lldb-3.9 +Package: lldb-4.0 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel # ia64 mips mipsel hurd powerpc ppc64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}), llvm-3.9-dev -Suggests: python-lldb-3.9 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}), llvm-4.0-dev +Suggests: python-lldb-4.0 Conflicts: lldb-3.4, lldb-3.5 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger @@ -417,14 +417,14 @@ Description: Next generation, high-performance debugger reusable components which highly leverage existing libraries in the larger LLVM Project, such as the Clang expression parser and LLVM disassembler. -Package: liblldb-3.9 +Package: liblldb-4.0 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel # ia64 mips mipsel hurd powerpc ppc64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs -Replaces: lldb-3.9 (<= 1:3.9~svn215195-2) -Breaks: lldb-3.9 (<< 1:3.9~svn215195-2) +Replaces: lldb-4.0 (<= 1:4.0~svn215195-2) +Breaks: lldb-4.0 (<< 1:4.0~svn215195-2) Description: Next generation, high-performance debugger, library LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM @@ -432,10 +432,10 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: liblldb-3.9-dbg +Package: liblldb-4.0-dbg Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel # ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.9 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-4.0 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: debug Priority: extra @@ -447,10 +447,10 @@ Description: Next generation, high-performance debugger, debugging libraries This package contains the LLDB runtime library debug symbols. -Package: python-lldb-3.9 +Package: python-lldb-4.0 Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.9-dev, python, python-six +Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-4.0-dev, python, python-six Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7, python-lldb-3.8 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, python lib @@ -461,13 +461,13 @@ Description: Next generation, high-performance debugger, python lib This binding package provides access to lldb. -Package: liblldb-3.9-dev +Package: liblldb-4.0-dev Section: libdevel Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel # ia64 mips mipsel hurd powerpc ppc64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.9 (= ${binary:Version}) -Replaces: lldb-3.9-dev (<= 1:3.9~svn215195-2) -Breaks: lldb-3.9-dev (<< 1:3.9~svn215195-2) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-4.0 (= ${binary:Version}) +Replaces: lldb-4.0-dev (<= 1:4.0~svn215195-2) +Breaks: lldb-4.0-dev (<< 1:4.0~svn215195-2) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files LLDB is a next generation, high-performance debugger. It is built as a set of diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 2e04c0eb..41683cae 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -15,8 +15,8 @@ set -e # sh 3.4/debian/orig-tar.sh RELEASE_34 rc1 SVN_BASE_URL=http://llvm.org/svn/llvm-project/ -MAJOR_VERSION=3.9 -CURRENT_VERSION=3.9 # Should be changed to 3.5.1 later +MAJOR_VERSION=4.0 +CURRENT_VERSION=4.0 # Should be changed to 3.5.1 later if test -n "$1"; then # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/ diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index f929c0bf..6eaae21a 100644 --- a/debian/patches/clang-analyzer-force-version.diff +++ b/debian/patches/clang-analyzer-force-version.diff @@ -1,16 +1,16 @@ # Force the version of clang in the analyzer # This was causing the static analyzer to fail silently if the clang & clang++ are # not installed -Index: llvm-toolchain-snapshot_3.9~svn253.96/clang/tools/scan-build/libexec/ccc-analyzer +Index: llvm-toolchain-snapshot_4.0~svn254.06/clang/tools/scan-build/libexec/ccc-analyzer =================================================================== ---- llvm-toolchain-snapshot_3.9~svn253.96.orig/clang/tools/scan-build/libexec/ccc-analyzer -+++ llvm-toolchain-snapshot_3.9~svn253.96/clang/tools/scan-build/libexec/ccc-analyzer +--- llvm-toolchain-snapshot_4.0~svn254.06.orig/clang/tools/scan-build/libexec/ccc-analyzer ++++ llvm-toolchain-snapshot_4.0~svn254.06/clang/tools/scan-build/libexec/ccc-analyzer @@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/ if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } $Clang = $ENV{'CLANG_CXX'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-3.9'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-4.0'; } $IsCXX = 1 } @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_3.9~svn253.96/clang/tools/scan-build/libexec/ccc- $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-3.9'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-4.0'; } $IsCXX = 0 } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 3d137c80..ccee12b1 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -1,39 +1,39 @@ -Index: llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_4.0~svn260089/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_3.9~svn260089.orig/clang/tools/clang-format/clang-format.py -+++ llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format.py +--- llvm-toolchain-snapshot_4.0~svn260089.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_4.0~svn260089/clang/tools/clang-format/clang-format.py @@ -34,7 +34,7 @@ import vim # 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.9' ++binary = 'clang-format-4.0' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path') -Index: llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_4.0~svn260089/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_3.9~svn260089.orig/clang/tools/clang-format/clang-format-diff.py -+++ llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format-diff.py +--- llvm-toolchain-snapshot_4.0~svn260089.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_4.0~svn260089/clang/tools/clang-format/clang-format-diff.py @@ -55,7 +55,7 @@ def main(): parser.add_argument('-style', help='formatting style to apply (LLVM, Google, Chromium, ' 'Mozilla, WebKit)') - parser.add_argument('-binary', default='clang-format', -+ parser.add_argument('-binary', default='clang-format-3.9', ++ parser.add_argument('-binary', default='clang-format-4.0', help='location of binary to use for clang-format') args = parser.parse_args() -Index: llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_4.0~svn260089/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_3.9~svn260089.orig/clang/tools/clang-format/clang-format.el -+++ llvm-toolchain-snapshot_3.9~svn260089/clang/tools/clang-format/clang-format.el +--- llvm-toolchain-snapshot_4.0~svn260089.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_4.0~svn260089/clang/tools/clang-format/clang-format.el @@ -36,7 +36,7 @@ :group 'tools) (defcustom clang-format-executable - (or (executable-find "clang-format") -+ (or (executable-find "clang-format-3.9") ++ (or (executable-find "clang-format-4.0") "clang-format") "Location of the clang-format executable. diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff index 196399b7..3f5a17a0 100644 --- a/debian/patches/lldb-libname.diff +++ b/debian/patches/lldb-libname.diff @@ -1,11 +1,13 @@ ---- a/lldb/scripts/Python/finishSwigPythonLLDB.py -+++ b/lldb/scripts/Python/finishSwigPythonLLDB.py -@@ -379,7 +379,7 @@ +Index: llvm-toolchain-snapshot_4.0~svn275970/lldb/scripts/Python/finishSwigPythonLLDB.py +=================================================================== +--- llvm-toolchain-snapshot_4.0~svn275970.orig/lldb/scripts/Python/finishSwigPythonLLDB.py ++++ llvm-toolchain-snapshot_4.0~svn275970/lldb/scripts/Python/finishSwigPythonLLDB.py +@@ -392,7 +392,7 @@ def make_symlink_liblldb(vDictArgs, vstr if eOSType == utilsOsType.EnumOsType.Darwin: strLibFileExtn = ".dylib" else: - strLibFileExtn = ".so" -+ strLibFileExtn = "-3.9.so" ++ strLibFileExtn = "-4.0.so" strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn) bOk, strErrMsg = make_symlink(vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget) diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index e91c5ca8..e8327a48 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -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.9.so' ++ file = 'libclang-4.0.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 fc44f455..4a9eb252 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -1,13 +1,13 @@ -Index: llvm-toolchain-snapshot_3.9~svn253.96/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_4.0~svn254.06/clang/tools/scan-build/bin/scan-build =================================================================== ---- llvm-toolchain-snapshot_3.9~svn253.96.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-snapshot_3.9~svn253.96/clang/tools/scan-build/bin/scan-build +--- llvm-toolchain-snapshot_4.0~svn254.06.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_4.0~svn254.06/clang/tools/scan-build/bin/scan-build @@ -1407,7 +1407,7 @@ sub FindClang { if (!defined $Options{AnalyzerDiscoveryMethod}) { $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-3.9/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-4.0/bin/clang"); } if (!defined $Clang || ! -x $Clang) { return "error: Cannot find an executable 'clang' relative to" . diff --git a/debian/rules b/debian/rules index a5d3a939..8e6590aa 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ DEB_INST := $(CURDIR)/debian/tmp/ # The 5| in the regexp is a crappy workaround. g++ 5.2 in Debian is not providing a g++-5.2 binary (only g++-5) # accomodate that by hardcoding the 5 detection GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?(5|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') -LLVM_VERSION := 3.9 +LLVM_VERSION := 4.0 LLVM_VERSION_FULL := $(LLVM_VERSION).0 SONAME_EXT := 1 # Manage the case when the version is 1:3.5~svn213052-1~exp1 or 1:3.4.2-1