new snapshot release

This commit is contained in:
Sylvestre Ledru 2017-01-14 11:10:21 +00:00
parent 7794cc423c
commit c593da3f05
9 changed files with 83 additions and 83 deletions

132
debian/control vendored
View File

@ -19,20 +19,20 @@ Vcs-Browser: https://svn.debian.org/viewsvn/pkg-llvm/llvm-toolchain/branches/sna
# ------------- clang -------------
Package: clang-4.0
Package: clang-5.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
${dep:devlibs-objc}, libclang-common-4.0-dev (= ${binary:Version}),
libclang1-4.0 (= ${binary:Version}), libc6-dev, binutils
${dep:devlibs-objc}, libclang-common-5.0-dev (= ${binary:Version}),
libclang1-5.0 (= ${binary:Version}), libc6-dev, binutils
Provides: c-compiler, objc-compiler, c++-compiler
Recommends: llvm-4.0-dev, python
Suggests: gnustep, gnustep-devel, clang-4.0-doc
Recommends: llvm-5.0-dev, python
Suggests: gnustep, gnustep-devel, clang-5.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,
clang-include-fixer-4.0
clang-include-fixer-5.0
Breaks: 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,
clang-include-fixer-4.0
clang-include-fixer-5.0
Description: C, C++ and Objective-C compiler (LLVM based)
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
@ -42,7 +42,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-4.0
Package: clang-format-5.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python
Replaces: clang-format-3.3
@ -59,18 +59,18 @@ Description: Tool to format C/C++/Obj-C code
.
This package also provides vim and emacs plugins.
Package: clang-tidy-4.0
Package: clang-tidy-5.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python
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)
Replaces: clang-modernize-5.0, clang-5.0 (<< 1:5.0~svn250696-1)
Breaks: clang-modernize-5.0, clang-5.0 (<< 1:5.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
via static analysis. clang-tidy is modular and provides a convenient interface
for writing new checks.
Package: clang-4.0-doc
Package: clang-5.0-doc
Architecture: all
Section: doc
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -85,7 +85,7 @@ Description: C, C++ and Objective-C compiler (LLVM based) - Documentation
.
This package contains the documentation.
Package: libclang1-4.0
Package: libclang1-5.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@ -107,12 +107,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-4.0-dbg
Package: libclang1-5.0-dbg
Architecture: any
Multi-Arch: same
Section: debug
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libclang1-5.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
@ -124,12 +124,12 @@ Description: clang library
.
This package contains the debugging symbols.
Package: libclang-4.0-dev
Package: libclang-5.0-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
${dep:devlibs-objc}, libclang1-4.0 (= ${binary:Version}),
libclang-common-4.0-dev (= ${binary:Version})
${dep:devlibs-objc}, libclang1-5.0 (= ${binary:Version}),
libclang-common-5.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
@ -140,12 +140,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-4.0.
libclang1-5.0.
Package: libclang-common-4.0-dev
Package: libclang-common-5.0-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm5.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
@ -159,10 +159,10 @@ Description: clang library - Common development package
(profiling, etc).
Package: libfuzzer-4.0-dev
Package: libfuzzer-5.0-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-5.0 (= ${binary:Version})
Description: Library for coverage-guided fuzz testing
LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing
of other libraries.
@ -180,7 +180,7 @@ Description: Library for coverage-guided fuzz testing
instrumentation.
Package: python-clang-4.0
Package: python-clang-5.0
Section: python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python
@ -198,7 +198,7 @@ Description: Clang Python Bindings
This binding package provides access to the Clang compiler and libraries.
Package: clang-4.0-examples
Package: clang-5.0-examples
Architecture: any
Section: doc
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -215,7 +215,7 @@ Description: Clang examples
# ------------- LLVM -------------
Package: libllvm4.0
Package: libllvm5.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -228,11 +228,11 @@ Description: Modular compiler and toolchain technologies, runtime library
.
This package contains the LLVM runtime library.
Package: libllvm4.0-dbg
Package: libllvm5.0-dbg
Architecture: any
Section: debug
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm5.0 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: Modular compiler and toolchain technologies, debugging libraries
@ -242,11 +242,11 @@ Description: Modular compiler and toolchain technologies, debugging libraries
.
This package contains the LLVM runtime library debug symbols.
Package: llvm-4.0
Package: llvm-5.0
Architecture: any
Suggests: llvm-4.0-doc
Depends: llvm-4.0-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: llvm-4.0-dev
Suggests: llvm-5.0-doc
Depends: llvm-5.0-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: llvm-5.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
@ -270,7 +270,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-4.0-runtime
Package: llvm-5.0-runtime
Architecture: any
Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends}
Conflicts: llvm (<< 2.7-1)
@ -291,10 +291,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter
This package provides the minimal required to execute programs in LLVM
format.
Package: llvm-4.0-dev
Package: llvm-5.0-dev
Architecture: any
Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends},
llvm-4.0 (= ${binary:Version}), libllvm4.0 (= ${binary:Version}), libtinfo-dev
llvm-5.0 (= ${binary:Version}), libllvm5.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
@ -312,10 +312,10 @@ Description: Modular compiler and toolchain technologies, libraries and headers
This package provides the libraries and headers to develop applications
using llvm.
Package: llvm-4.0-tools
Package: llvm-5.0-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
llvm-4.0-dev (= ${binary:Version})
llvm-5.0-dev (= ${binary:Version})
Description: Modular compiler and toolchain technologies, tools
LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other
@ -331,11 +331,11 @@ Description: Modular compiler and toolchain technologies, tools
.
This package provides tools for testing.
Package: libllvm-4.0-ocaml-dev
Package: libllvm-5.0-ocaml-dev
Section: ocaml
Architecture: any
Suggests: llvm-4.0-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-4.0-dev (= ${binary:Version})
Suggests: llvm-5.0-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-5.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
@ -352,7 +352,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings
.
This package provides the OCaml bindings to develop applications using llvm.
Package: llvm-4.0-doc
Package: llvm-5.0-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
@ -371,10 +371,10 @@ Description: Modular compiler and toolchain technologies, documentation
.
This package contains all documentation (extensive).
Package: llvm-4.0-examples
Package: llvm-5.0-examples
Section: doc
Architecture: all
Depends: ${misc:Depends}, llvm-4.0-dev (>= ${source:Version}), llvm-4.0-dev (<< ${source:Version}+c~)
Depends: ${misc:Depends}, llvm-5.0-dev (>= ${source:Version}), llvm-5.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
@ -394,20 +394,20 @@ Description: Modular compiler and toolchain technologies, examples
# ------------- lld -------------
Package: lld-4.0
Package: lld-5.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}, libllvm4.0 (= ${binary:Version}), llvm-4.0-dev
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm5.0 (= ${binary:Version}), llvm-5.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-4.0
Package: liblld-5.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}, libllvm4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm5.0 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs
Description: LLVM-based linker, library
@ -417,10 +417,10 @@ Description: LLVM-based linker, library
.
This package contains the LLD runtime library.
Package: liblld-4.0-dbg
Package: liblld-5.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-4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, liblld-5.0 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: debug
Priority: extra
@ -432,11 +432,11 @@ Description: LLVM-based linker, debugging libraries
This package contains the LLD runtime library debug symbols.
Package: liblld-4.0-dev
Package: liblld-5.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-4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, lld-5.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
@ -448,11 +448,11 @@ Description: LLVM-based linker, header files
# ------------- lldb -------------
Package: lldb-4.0
Package: lldb-5.0
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version}), llvm-4.0-dev,
python-lldb-4.0
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm5.0 (= ${binary:Version}), llvm-5.0-dev,
python-lldb-5.0
Conflicts: lldb-3.4, lldb-3.5
Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger
@ -460,14 +460,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-4.0
Package: liblldb-5.0
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm5.0 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs
Replaces: lldb-4.0 (<= 1:4.0~svn215195-2)
Breaks: lldb-4.0 (<< 1:4.0~svn215195-2)
Replaces: lldb-5.0 (<= 1:5.0~svn215195-2)
Breaks: lldb-5.0 (<< 1:5.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
@ -475,10 +475,10 @@ Description: Next generation, high-performance debugger, library
.
This package contains the LLDB runtime library.
Package: liblldb-4.0-dbg
Package: liblldb-5.0-dbg
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd ppc64el alpha s390x sparc64 powerpc ppc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-4.0 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-5.0 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: debug
Priority: extra
@ -490,11 +490,11 @@ Description: Next generation, high-performance debugger, debugging libraries
This package contains the LLDB runtime library debug symbols.
Package: python-lldb-4.0
Package: python-lldb-5.0
Section: python
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd ppc64 ppc64el alpha s390x powerpc sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-4.0-dev, python, python-six
Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-5.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, python-lldb-3.9
Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger, python lib
@ -505,13 +505,13 @@ Description: Next generation, high-performance debugger, python lib
This binding package provides access to lldb.
Package: liblldb-4.0-dev
Package: liblldb-5.0-dev
Section: libdevel
Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel arm64
# ia64 mips mipsel hurd powerpc ppc64 ppc64el sparc64 have been removed
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)
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-5.0 (= ${binary:Version})
Replaces: lldb-5.0-dev (<= 1:5.0~svn215195-2)
Breaks: lldb-5.0-dev (<< 1:5.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

4
debian/orig-tar.sh vendored
View File

@ -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=4.0
CURRENT_VERSION=4.0 # Should be changed to 3.5.1 later
MAJOR_VERSION=5.0
CURRENT_VERSION=5.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/

View File

@ -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_4.0~svn254.06/clang/tools/scan-build/libexec/ccc-analyzer
Index: llvm-toolchain-snapshot_5.0~svn255.06/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
--- llvm-toolchain-snapshot_5.0~svn255.06.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_5.0~svn255.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++-4.0'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-5.0'; }
$IsCXX = 1
}
@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_4.0~svn254.06/clang/tools/scan-build/libexec/ccc-
$Clang = $ENV{'CLANG'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-4.0'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-5.0'; }
$IsCXX = 0
}

View File

@ -11,7 +11,7 @@
help='formatting style to apply (LLVM, Google, Chromium, '
'Mozilla, WebKit)')
- parser.add_argument('-binary', default='clang-format',
+ parser.add_argument('-binary', default='clang-format-4.0',
+ parser.add_argument('-binary', default='clang-format-5.0',
help='location of binary to use for clang-format')
args = parser.parse_args()
@ -22,7 +22,7 @@
(defcustom clang-format-executable
- (or (executable-find "clang-format")
+ (or (executable-find "clang-format-4.0")
+ (or (executable-find "clang-format-5.0")
"clang-format")
"Location of the clang-format executable.
@ -33,7 +33,7 @@
# 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-4.0'
+binary = 'clang-format-5.0'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')

View File

@ -12,10 +12,10 @@ which could then break something else.
This probably should have upstream bug but I couldn't find any existing report.
Index: llvm-toolchain-snapshot_4.0~svn291432/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
Index: llvm-toolchain-snapshot_5.0~svn291432/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
===================================================================
--- llvm-toolchain-snapshot_4.0~svn291432.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_4.0~svn291432/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
--- llvm-toolchain-snapshot_5.0~svn291432.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_5.0~svn291432/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -32,6 +32,7 @@
#include "lldb/Target/Process.h"
#include "llvm/ADT/SmallString.h"

View File

@ -9,7 +9,7 @@
strLibFileExtn = ".dylib"
else:
- strLibFileExtn = ".so"
+ strLibFileExtn = "-4.0.so"
+ strLibFileExtn = "-5.0.so"
strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink(

View File

@ -9,7 +9,7 @@
file = 'libclang.dll'
else:
- file = 'libclang.so'
+ file = 'libclang-4.0.so'
+ file = 'libclang-5.0.so'
if Config.library_path:
file = Config.library_path + '/' + file

View File

@ -9,7 +9,7 @@
$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-4.0/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-5.0/bin/clang");
}
if (!defined $Clang || ! -x $Clang) {
return "error: Cannot find an executable 'clang' relative to" .

2
debian/rules vendored
View File

@ -6,7 +6,7 @@ DEB_INST := $(CURDIR)/debian/tmp/
# The 5|6| 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|6|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p')
LLVM_VERSION := 4.0
LLVM_VERSION := 5.0
LLVM_VERSION_FULL := $(LLVM_VERSION).0
SONAME_EXT := 1