version 10

This commit is contained in:
Sylvestre Ledru 2019-07-18 15:59:42 +02:00
parent 7d383029c1
commit f0427298e2
14 changed files with 159 additions and 153 deletions

18
debian/README vendored
View File

@ -2,7 +2,7 @@ Organization of the repository
==============================
The debian package for each LLVM point release is maintained as a git branch.
For example, the 9 release lives at in the "9" branch.
For example, the 10 release lives at in the "10" branch.
The current snapshot release is maintained in the "snapshot" branch.
@ -33,7 +33,7 @@ Steps for manually building a snapshot release
$ sh unpack.sh
which will unpack the source tree inside a new directory such as
branches/llvm-toolchain-snapshot_3.9~svn269942. Depending on the current
branches/llvm-toolchain-snapshot_3.10~svn26101042. Depending on the current
snapshot version number and svn release, the directory name will be
different.
@ -50,24 +50,24 @@ Retrieving a specific branch or release candidate with orig-tar.sh
==================================================================
When using orig-tar.sh, if you need to retrieve a specific branch, you can pass
the branch name as the first argument. For example, to get the 9 release
the branch name as the first argument. For example, to get the 10 release
branch at
http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_90
http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_100
you should use,
$ sh snapshot/debian/orig-tar.sh release_90
$ sh snapshot/debian/orig-tar.sh release_100
To retrieve a specific release candidate, you can pass the branch name as the
first argument, and the tag rc number as the second argument. For example, to
get the 9.0.1 release candidate rc3 at
http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_901/rc3
get the 10.0.1 release candidate rc3 at
http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_1001/rc3
you should use,
$ sh snapshot/debian/orig-tar.sh RELEASE_901 rc3 9.0.1
$ sh snapshot/debian/orig-tar.sh RELEASE_1001 rc3 10.0.1
For a stable release, the syntax is:
$ sh snapshot/debian/orig-tar.sh RELEASE_900 final 9.0
$ sh snapshot/debian/orig-tar.sh RELEASE_1000 final 10.0
Additional maintainer scripts

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-snapshot (1:10~svn366022-1~exp2) experimental; urgency=medium
* New version in snapshot (10)
--
llvm-toolchain-snapshot (1:9~svn366022-1~exp1) experimental; urgency=medium
* New snapshot release

178
debian/control vendored
View File

@ -27,14 +27,14 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
# ------------- clang -------------
Package: clang-9
Package: clang-10
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
${dep:devlibs-objc}, libclang-common-9-dev (= ${binary:Version}),
libclang1-9 (= ${binary:Version}), libc6-dev, binutils
${dep:devlibs-objc}, libclang-common-10-dev (= ${binary:Version}),
libclang1-10 (= ${binary:Version}), libc6-dev, binutils
Provides: c-compiler, objc-compiler, c++-compiler
Recommends: llvm-9-dev, python, libomp-9-dev
Suggests: clang-9-doc
Recommends: llvm-10-dev, python, libomp-10-dev
Suggests: clang-10-doc
Description: C, C++ and Objective-C compiler
Clang project is a C, C++, Objective C and Objective C++ front-end
based on the LLVM compiler. Its goal is to offer a replacement to the
@ -43,9 +43,9 @@ Description: C, C++ and Objective-C compiler
Clang implements all of the ISO C++ 1998, 11 and 14 standards and also
provides most of the support of C++17.
Package: clang-tools-9
Package: clang-tools-10
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-9 (= ${binary:Version}),
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-10 (= ${binary:Version}),
python
Description: clang-based tools for C/C++ developments
Clang project is a C, C++, Objective C and Objective C++ front-end
@ -58,10 +58,10 @@ Description: clang-based tools for C/C++ developments
This package contains some clang-based tools like scan-build, clangd,
clang-cl, etc.
Package: clang-format-9
Package: clang-format-10
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
libllvm9 (= ${binary:Version})
libllvm10 (= ${binary:Version})
Description: Tool to format C/C++/Obj-C code
Clang-format is both a library and a stand-alone tool with the goal of
automatically reformatting C++ sources files according to configurable
@ -74,20 +74,20 @@ Description: Tool to format C/C++/Obj-C code
.
This package also provides vim and emacs plugins.
Package: clang-tidy-9
Package: clang-tidy-10
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
libllvm9 (= ${binary:Version}), libclang-common-9-dev,
clang-tools-9, python-yaml
Replaces: clang-modernize-9, clang-9 (<< 9~svn250696-1)
Breaks: clang-modernize-9, clang-9 (<< 9~svn250696-1)
libllvm10 (= ${binary:Version}), libclang-common-10-dev,
clang-tools-10, python-yaml
Replaces: clang-modernize-10
Breaks: clang-modernize-10
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-9-doc
Package: clang-10-doc
Architecture: all
Section: doc
Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax
@ -101,7 +101,7 @@ Description: C, C++ and Objective-C compiler - Documentation
.
This package contains the documentation.
Package: libclang1-9
Package: libclang1-10
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -122,12 +122,12 @@ Description: C interface to the Clang library
locations with elements within the AST, and other facilities that support
Clang-based development tools.
Package: libclang-9-dev
Package: libclang-10-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
${dep:devlibs-objc}, libclang1-9 (= ${binary:Version}),
libclang-common-9-dev (= ${binary:Version})
${dep:devlibs-objc}, libclang1-10 (= ${binary:Version}),
libclang-common-10-dev (= ${binary:Version})
Description: Clang library - Development package
Clang project is a C, C++, Objective C and Objective C++ front-end
based on the LLVM compiler. Its goal is to offer a replacement to the
@ -137,12 +137,12 @@ Description: Clang library - Development package
provides most of the support of C++17.
.
This package contains the Clang headers to develop extensions over
libclang1-9.
libclang1-10.
Package: libclang-common-9-dev
Package: libclang-common-10-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version})
Description: Clang library - Common development package
Clang project is a C, C++, Objective C and Objective C++ front-end
based on the LLVM compiler. Its goal is to offer a replacement to the
@ -154,7 +154,7 @@ Description: Clang library - Common development package
This package contains the Clang generic headers and some libraries
(profiling, etc).
Package: libclang-cpp1-9
Package: libclang-cpp1-10
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -176,10 +176,10 @@ Description: C++ interface to the Clang library
Clang-based development tools.
Package: libfuzzer-9-dev
Package: libfuzzer-10-dev
Architecture: linux-any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-9 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, clang-10 (= ${binary:Version})
Description: Library for coverage-guided fuzz testing
LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing
of other libraries.
@ -197,12 +197,12 @@ Description: Library for coverage-guided fuzz testing
instrumentation.
Package: python-clang-9
Package: python-clang-10
Section: python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python
Replaces: python-clang-3.9, python-clang-3.9, python-clang-x.y
Breaks: python-clang-3.9, python-clang-3.9
Replaces: python-clang-3.10, python-clang-3.10, python-clang-x.y
Breaks: python-clang-3.10, python-clang-3.10
Conflicts: python-clang-x.y
Provides: python-clang-x.y
Description: Clang Python Bindings
@ -216,7 +216,7 @@ Description: Clang Python Bindings
This binding package provides access to the Clang compiler and libraries.
Package: clang-9-examples
Package: clang-10-examples
Architecture: any
Section: doc
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -232,14 +232,14 @@ Description: Clang examples
# ------------- LLVM -------------
Package: libllvm9
Package: libllvm10
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Breaks: libllvm3.9v4
Replaces: libllvm3.9v4
Breaks: libllvm3.10v4
Replaces: libllvm3.10v4
Description: Modular compiler and toolchain technologies, runtime library
LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other
@ -247,11 +247,11 @@ Description: Modular compiler and toolchain technologies, runtime library
.
This package contains the LLVM runtime library.
Package: llvm-9
Package: llvm-10
Architecture: any
Suggests: llvm-9-doc
Depends: llvm-9-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: llvm-9-dev
Suggests: llvm-10-doc
Depends: llvm-10-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: llvm-10-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
@ -273,9 +273,9 @@ Description: Modular compiler and toolchain technologies
academic research projects and commercial projects. LLVM includes C
and C++ front-ends, a front-end for a Forth-like language (Stacker),
a young scheme front-end, and Java support is in development. LLVM can
generate code for X96, SparcV9, PowerPC or many other architectures.
generate code for X96, SparcV10, PowerPC or many other architectures.
Package: llvm-9-runtime
Package: llvm-10-runtime
Architecture: any
Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends}
Description: Modular compiler and toolchain technologies, IR interpreter
@ -294,10 +294,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter
This package provides the minimal required to execute programs in LLVM
format.
Package: llvm-9-dev
Package: llvm-10-dev
Architecture: any
Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends},
llvm-9 (= ${binary:Version}), libllvm9 (= ${binary:Version}), libtinfo-dev
Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.10), ${misc:Depends},
llvm-10 (= ${binary:Version}), libllvm10 (= ${binary:Version}), libtinfo-dev
Description: Modular compiler and toolchain technologies, libraries and headers
LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other
@ -314,11 +314,11 @@ Description: Modular compiler and toolchain technologies, libraries and headers
This package provides the libraries and headers to develop applications
using llvm.
Package: llvm-9-tools
Package: llvm-10-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
python-pygments, python-yaml,
llvm-9-dev (= ${binary:Version})
llvm-10-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
@ -334,11 +334,11 @@ Description: Modular compiler and toolchain technologies, tools
.
This package provides tools for testing.
Package: libllvm-9-ocaml-dev
Package: libllvm-10-ocaml-dev
Section: ocaml
Architecture: amd64 arm64 armhf i386 ppc64el s390x
Suggests: llvm-9-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-9-dev (= ${binary:Version})
Suggests: llvm-10-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-10-dev (= ${binary:Version})
Replaces: libllvm-x.y-ocaml-dev
Conflicts: libllvm-x.y-ocaml-dev
Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev
@ -357,7 +357,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings
.
This package provides the OCaml bindings to develop applications using llvm.
Package: llvm-9-doc
Package: llvm-10-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
@ -376,10 +376,10 @@ Description: Modular compiler and toolchain technologies, documentation
.
This package contains all documentation (extensive).
Package: llvm-9-examples
Package: llvm-10-examples
Section: doc
Architecture: all
Depends: ${misc:Depends}, llvm-9-dev (>= ${source:Version}), llvm-9-dev (<< ${source:Version}+c~)
Depends: ${misc:Depends}, llvm-10-dev (>= ${source:Version}), llvm-10-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
@ -399,20 +399,20 @@ Description: Modular compiler and toolchain technologies, examples
# ------------- lld -------------
Package: lld-9
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32
Package: lld-10
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m610k powerpcspe ppc64 sh4 sparc64 x32
# ia64 hurd powerpc have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version})
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-9
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32
Package: liblld-10
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m610k powerpcspe ppc64 sh4 sparc64 x32
# ia64 hurd powerpc have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs
Description: LLVM-based linker, library
@ -422,12 +422,12 @@ Description: LLVM-based linker, library
.
This package contains the LLD runtime library.
Package: liblld-9-dev
Package: liblld-10-dev
Section: libdevel
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m610k powerpcspe ppc64 sh4 sparc64 x32
# ia64 hurd powerpc have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lld-9 (= ${binary:Version}),
liblld-9 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, lld-10 (= ${binary:Version}),
liblld-10 (= ${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
@ -439,25 +439,25 @@ Description: LLVM-based linker, header files
# ------------- lldb -------------
Package: lldb-9
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m69k sh4 x32
Package: lldb-10
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m610k sh4 x32
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}), llvm-9-dev,
python-lldb-9
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version}), llvm-10-dev,
python-lldb-10
Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger
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
Project, such as the Clang expression parser and LLVM disassembler.
Package: liblldb-9
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m69k sh4 x32
Package: liblldb-10
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m610k sh4 x32
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version})
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm10 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs
Replaces: lldb-9 (<= 9~svn215195-2)
Breaks: lldb-9 (<< 9~svn215195-2)
Replaces: lldb-10 (<= 10~svn2151105-2)
Breaks: lldb-10 (<< 10~svn2151105-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
@ -465,12 +465,12 @@ Description: Next generation, high-performance debugger, library
.
This package contains the LLDB runtime library.
Package: python-lldb-9
Package: python-lldb-10
Section: python
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m69k sh4 x32
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m610k sh4 x32
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-six
Conflicts: python-lldb-3.9, python-lldb-3.9, python-lldb-x.y
Conflicts: python-lldb-3.10, python-lldb-3.10, python-lldb-x.y
Replaces: python-lldb-x.y
Provides: python-lldb-x.y
Pre-Depends: ${misc:Pre-Depends}
@ -482,9 +482,9 @@ Description: Next generation, high-performance debugger, python lib
This binding package provides access to lldb.
Package: python3-lldb-9
Package: python3-lldb-10
Section: python
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m69k sh4 x32
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m610k sh4 x32
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-six
Conflicts: python3-lldb-x.y
@ -499,13 +499,13 @@ Description: Next generation, high-performance debugger, python3 lib
This binding package provides access to lldb.
Package: liblldb-9-dev
Package: liblldb-10-dev
Section: libdevel
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m69k sh4 x32
Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m610k sh4 x32
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-9 (= ${binary:Version})
Replaces: lldb-9-dev (<= 9~svn215195-2)
Breaks: lldb-9-dev (<< 9~svn215195-2)
Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-10 (= ${binary:Version})
Replaces: lldb-10-dev (<= 10~svn2151105-2)
Breaks: lldb-10-dev (<< 10~svn2151105-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
@ -519,11 +519,11 @@ Description: Next generation, high-performance debugger, header files
# 44 because it was the first version in which openmp & libc++ have been
# managed in llvm-defaults
Package: libomp-9-dev
Package: libomp-10-dev
Section: libdevel
Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
Depends: libomp5-9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-9-doc
Depends: libomp5-10 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-10-doc
Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
Provides: libomp-x.y-dev
Conflicts: libomp-x.y-dev
@ -533,7 +533,7 @@ Description: LLVM OpenMP runtime - dev package
linked against, and that manages the multiple threads in an OpenMP program
while it is executing.
Package: libomp5-9
Package: libomp5-10
Multi-Arch: same
Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
Depends: ${shlibs:Depends}, ${misc:Depends}
@ -546,7 +546,7 @@ Description: LLVM OpenMP runtime
linked against, and that manages the multiple threads in an OpenMP program
while it is executing.
Package: libomp-9-doc
Package: libomp-10-doc
Section: doc
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
@ -561,7 +561,7 @@ Description: LLVM OpenMP runtime - Documentation
# ------------- libcxx -------------
Package: libc++1-9
Package: libc++1-10
Section: libs
Architecture: any
Multi-Arch: same
@ -585,11 +585,11 @@ Description: LLVM C++ Standard library
as exception objects, rtti and memory allocation.
* Extensive unit tests.
Package: libc++-9-dev
Package: libc++-10-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libc++1-9 (= ${binary:Version}), ${misc:Depends}
Depends: libc++1-10 (= ${binary:Version}), ${misc:Depends}
Breaks: libc++-dev (<< 44)
Provides: libc++-x.y-dev
Conflicts: libc++-x.y-dev
@ -609,7 +609,7 @@ Description: LLVM C++ Standard library (development files)
# ------------- libcxxabi -------------
Package: libc++abi1-9
Package: libc++abi1-10
Section: libs
Architecture: any
Multi-Arch: same
@ -628,11 +628,11 @@ Description: LLVM low level support for a standard C++ library
* Correctness as defined by the C++ standards.
* Provide a portable sublayer to ease the porting of libc++
Package: libc++abi-9-dev
Package: libc++abi-10-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libc++abi1-9 (= ${binary:Version}), ${misc:Depends}
Depends: libc++abi1-10 (= ${binary:Version}), ${misc:Depends}
Breaks: libc++abi-dev (<= 44)
Provides: libc++abi-x.y-dev
Conflicts: libc++abi-x.y-dev

4
debian/orig-tar.sh vendored
View File

@ -19,8 +19,8 @@ set -e
# sh 4.0/debian/orig-tar.sh RELEASE_40 rc1
SVN_BASE_URL=https://llvm.org/svn/llvm-project/
MAJOR_VERSION=9
CURRENT_VERSION=9 # Should be changed to 3.5.1 later
MAJOR_VERSION=10
CURRENT_VERSION=10 # Should be changed to 3.5.1 later
if test -n "$1"; then
# https://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_9~svn339515/clang/tools/scan-build/libexec/ccc-analyzer
Index: llvm-toolchain-snapshot_10~svn3310515/clang/tools/scan-build/libexec/ccc-analyzer
===================================================================
--- llvm-toolchain-snapshot_9~svn339515.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_9~svn339515/clang/tools/scan-build/libexec/ccc-analyzer
@@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
--- llvm-toolchain-snapshot_10~svn3310515.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_10~svn3310515/clang/tools/scan-build/libexec/ccc-analyzer
@@ -101,7 +101,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++-9'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-10'; }
$IsCXX = 1
}
@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_9~svn339515/clang/tools/scan-build/libexec/ccc-an
$Clang = $ENV{'CLANG'};
- if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-9'; }
+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-10'; }
$IsCXX = 0
}

View File

@ -4,42 +4,42 @@
clang/tools/clang-format/clang-format.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format-diff.py
Index: llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format-diff.py
===================================================================
--- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format-diff.py
--- llvm-toolchain-snapshot_10~svn3422610.orig/clang/tools/clang-format/clang-format-diff.py
+++ llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format-diff.py
@@ -57,7 +57,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-9',
+ parser.add_argument('-binary', default='clang-format-10',
help='location of binary to use for clang-format')
args = parser.parse_args()
Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.el
Index: llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format.el
===================================================================
--- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format.el
+++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.el
--- llvm-toolchain-snapshot_10~svn3422610.orig/clang/tools/clang-format/clang-format.el
+++ llvm-toolchain-snapshot_10~svn3422610/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-9")
+ (or (executable-find "clang-format-10")
"clang-format")
"Location of the clang-format executable.
Index: llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.py
Index: llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format.py
===================================================================
--- llvm-toolchain-snapshot_9~svn342269.orig/clang/tools/clang-format/clang-format.py
+++ llvm-toolchain-snapshot_9~svn342269/clang/tools/clang-format/clang-format.py
--- llvm-toolchain-snapshot_10~svn3422610.orig/clang/tools/clang-format/clang-format.py
+++ llvm-toolchain-snapshot_10~svn3422610/clang/tools/clang-format/clang-format.py
@@ -36,7 +36,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-9'
+binary = 'clang-format-10'
if vim.eval('exists("g:clang_format_path")') == "1":
binary = vim.eval('g:clang_format_path')

View File

@ -1,17 +1,17 @@
Index: llvm-toolchain-snapshot_9~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
Index: llvm-toolchain-snapshot_10~svn3422610/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
===================================================================
--- llvm-toolchain-snapshot_9~svn342269.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_9~svn342269/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -179,10 +179,10 @@ def main():
--- llvm-toolchain-snapshot_10~svn3422610.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+++ llvm-toolchain-snapshot_10~svn3422610/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
@@ -1710,10 +1710,10 @@ def main():
'clang-tidy and clang-apply-replacements in '
'$PATH.')
parser.add_argument('-clang-tidy-binary', metavar='PATH',
- default='clang-tidy',
+ default='clang-tidy-9',
+ default='clang-tidy-10',
help='path to clang-tidy binary')
parser.add_argument('-clang-apply-replacements-binary', metavar='PATH',
- default='clang-apply-replacements',
+ default='clang-apply-replacements-9',
+ default='clang-apply-replacements-10',
help='path to clang-apply-replacements binary')
parser.add_argument('-checks', default=None,
help='checks filter, when not specified, use clang-tidy '

View File

@ -1,12 +1,12 @@
Index: llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view
Index: llvm-toolchain-3.10-3.10/clang/tools/scan-view/bin/scan-view
===================================================================
--- llvm-toolchain-3.9-3.9.orig/clang/tools/scan-view/bin/scan-view
+++ llvm-toolchain-3.9-3.9/clang/tools/scan-view/bin/scan-view
@@ -23,6 +23,7 @@ kDefaultPort = 9191
--- llvm-toolchain-3.10-3.10.orig/clang/tools/scan-view/bin/scan-view
+++ llvm-toolchain-3.10-3.10/clang/tools/scan-view/bin/scan-view
@@ -23,6 +23,7 @@ kDefaultPort = 101101
kMaxPortsToTry = 100
###
+BASE_DIR = '/usr/share/clang/scan-view-9'
+BASE_DIR = '/usr/share/clang/scan-view-10'
def url_is_up(url):

View File

@ -2,16 +2,16 @@
lldb/scripts/Python/finishSwigPythonLLDB.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_9~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
Index: llvm-toolchain-snapshot_10~svn3310515/lldb/scripts/Python/finishSwigPythonLLDB.py
===================================================================
--- llvm-toolchain-snapshot_9~svn339515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ llvm-toolchain-snapshot_9~svn339515/lldb/scripts/Python/finishSwigPythonLLDB.py
--- llvm-toolchain-snapshot_10~svn3310515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ llvm-toolchain-snapshot_10~svn3310515/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -443,7 +443,7 @@ def make_symlink_liblldb(
if eOSType == utilsOsType.EnumOsType.Darwin:
strLibFileExtn = ".dylib"
else:
- strLibFileExtn = ".so"
+ strLibFileExtn = "-9.so"
+ strLibFileExtn = "-10.so"
strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink(

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_9~svn352271/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
Index: llvm-toolchain-snapshot_10~svn352271/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
===================================================================
--- llvm-toolchain-snapshot_9~svn352271.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_9~svn352271/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
--- llvm-toolchain-snapshot_10~svn352271.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_10~svn352271/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -32,13 +32,14 @@
#include "lldb/Utility/StreamString.h"
#include "llvm/ADT/SmallString.h"

View File

@ -2,16 +2,16 @@
clang/bindings/python/clang/cindex.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_9~svn342269/clang/bindings/python/clang/cindex.py
Index: llvm-toolchain-snapshot_10~svn3422610/clang/bindings/python/clang/cindex.py
===================================================================
--- llvm-toolchain-snapshot_9~svn342269.orig/clang/bindings/python/clang/cindex.py
+++ llvm-toolchain-snapshot_9~svn342269/clang/bindings/python/clang/cindex.py
--- llvm-toolchain-snapshot_10~svn3422610.orig/clang/bindings/python/clang/cindex.py
+++ llvm-toolchain-snapshot_10~svn3422610/clang/bindings/python/clang/cindex.py
@@ -4144,7 +4144,7 @@ class Config:
elif name == 'Windows':
file = 'libclang.dll'
else:
- file = 'libclang.so'
+ file = 'libclang-9.so'
+ file = 'libclang-10.so'
if Config.library_path:
file = Config.library_path + '/' + file

View File

@ -2,16 +2,16 @@
clang/tools/scan-build/bin/scan-build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_9~svn356328/clang/tools/scan-build/bin/scan-build
Index: llvm-toolchain-snapshot_10~svn356328/clang/tools/scan-build/bin/scan-build
===================================================================
--- llvm-toolchain-snapshot_9~svn356328.orig/clang/tools/scan-build/bin/scan-build
+++ llvm-toolchain-snapshot_9~svn356328/clang/tools/scan-build/bin/scan-build
--- llvm-toolchain-snapshot_10~svn356328.orig/clang/tools/scan-build/bin/scan-build
+++ llvm-toolchain-snapshot_10~svn356328/clang/tools/scan-build/bin/scan-build
@@ -1477,7 +1477,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-9/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-10/bin/clang");
if (!defined $Clang || ! -x $Clang) {
# 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

View File

@ -1,12 +1,12 @@
#!/bin/sh
ORIG_VERSION=8
TARGET_VERSION=9
ORIG_VERSION_2=8_0
TARGET_VERSION_2=9_0
ORIG_VERSION_3=80
TARGET_VERSION_3=90
ORIG_VERSION=9
TARGET_VERSION=10
ORIG_VERSION_2=9_0
TARGET_VERSION_2=10_0
ORIG_VERSION_3=90
TARGET_VERSION_3=100
LIST=`ls debian/control 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 debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control`
LIST=`ls debian/control 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 debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control`
for F in $LIST; do
sed -i -e "s|$ORIG_VERSION_3|$TARGET_VERSION_3|g" $F
sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F

View File

@ -1,6 +1,6 @@
Test-Command: bash -v ./debian/qualify-clang.sh
Depends: @, cmake, g++, file, dpkg-dev
# Comment the dbgsym package because of bug #917528
# Comment the dbgsym package because of bug #1017528
# dbgsym packages not being available in testing
# clang-9-dbgsym, libclang1-9-dbgsym
# clang-10-dbgsym, libclang1-10-dbgsym
Restrictions: allow-stderr