From cf9a0de75bbf58f0fa936da7cf8ef2b99f05997f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 15 Jul 2020 17:25:58 +0200 Subject: [PATCH] prepare -12 --- debian/README | 2 +- debian/changelog | 12 +- debian/control | 154 +++++++++--------- .../patches/clang-analyzer-force-version.diff | 10 +- debian/patches/clang-format-version.diff | 24 +-- debian/patches/clang-tidy-run-bin.diff | 10 +- debian/patches/fix-scan-view-path.diff | 8 +- debian/patches/lldb-libname.diff | 8 +- ...ddversion-suffix-to-llvm-server-exec.patch | 6 +- debian/patches/python-clangpath.diff | 8 +- debian/patches/scan-build-clang-path.diff | 8 +- debian/prepare-new-release.sh | 12 +- debian/tests/control | 8 +- debian/unpack.sh | 2 +- 14 files changed, 134 insertions(+), 138 deletions(-) diff --git a/debian/README b/debian/README index 7e86a204..cdf5f885 100644 --- a/debian/README +++ b/debian/README @@ -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~+20191018225217+3b113a2be6d. + branches/llvm-toolchain-snapshot_3.9~+20191018225217+3b123a2be6d. (date+hour+short git hash). Depending on the current snapshot version number and git release, the directory name will be diff --git a/debian/changelog b/debian/changelog index 37aa4036..c7332c7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,13 @@ -llvm-toolchain-snapshot (1:11~++20200702111259+07bda98b6af-1~exp1) UNRELEASED; urgency=medium +llvm-toolchain-snapshot (1:12~++20200701093119+ffee8040534-1~exp2) UNRELEASED; urgency=medium - * experimental New snapshot release - - -- Sylvestre Ledru Thu, 02 Jul 2020 11:16:03 +0200 - -llvm-toolchain-snapshot (1:11~++20200701093119+ffee8040534-1~exp2) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] + * Snapshot is now -12 + [ Samuel Thibault ] * debian/patches/hurd/hurd-EIEIO-undef.diff: Remove, upstreamed. * debian/patches/hurd/hurd-cxx-paths.diff: Remove, upstreamed. - -- Samuel Thibault Tue, 07 Jul 2020 18:05:31 +0200 + -- Sylvestre Ledru Wed, 15 Jul 2020 17:26:10 +0200 llvm-toolchain-snapshot (1:11~++20200701093119+ffee8040534-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index bde9a46d..384ab1e5 100644 --- a/debian/control +++ b/debian/control @@ -27,14 +27,14 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot # ------------- clang ------------- -Package: clang-11 +Package: clang-12 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang-common-11-dev (= ${binary:Version}), - libclang1-11 (= ${binary:Version}), libc6-dev, binutils + ${dep:devlibs-objc}, libclang-common-12-dev (= ${binary:Version}), + libclang1-12 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-11-dev, python3, libomp-11-dev -Suggests: clang-11-doc +Recommends: llvm-12-dev, python3, libomp-12-dev +Suggests: clang-12-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, 14 and 17 standards and also provides most of the support of C++20. -Package: clang-tools-11 +Package: clang-tools-12 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-11 (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-12 (= ${binary:Version}), python3 Description: clang-based tools for C/C++ developments Clang project is a C, C++, Objective C and Objective C++ front-end @@ -57,10 +57,10 @@ Description: clang-based tools for C/C++ developments . This package contains some clang-based tools like scan-build, clang-cl, etc. -Package: clang-format-11 +Package: clang-format-12 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm11 (= ${binary:Version}) + libllvm12 (= ${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 @@ -73,21 +73,21 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: clang-tidy-11 +Package: clang-tidy-12 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm11 (= ${binary:Version}), libclang-common-11-dev, - clang-tools-11, python3-yaml + libllvm12 (= ${binary:Version}), libclang-common-12-dev, + clang-tools-12, python3-yaml 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: clangd-11 +Package: clangd-12 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libclang-common-11-dev (= ${binary:Version}) + libclang-common-12-dev (= ${binary:Version}) Description: Language server that provides IDE-like features to editors clangd understands your C++ code and adds smart features to your editor: - code completion @@ -98,7 +98,7 @@ Description: Language server that provides IDE-like features to editors clangd is a language server that implements the Language Server Protocol; it can work with many editors through a plugin. -Package: clang-11-doc +Package: clang-12-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax @@ -112,7 +112,7 @@ Description: C, C++ and Objective-C compiler - Documentation . This package contains the documentation. -Package: libclang1-11 +Package: libclang1-12 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -133,12 +133,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-11-dev +Package: libclang-12-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang1-11 (= ${binary:Version}), - libclang-common-11-dev (= ${binary:Version}) + ${dep:devlibs-objc}, libclang1-12 (= ${binary:Version}), + libclang-common-12-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 @@ -148,12 +148,12 @@ Description: Clang library - Development package provides most of the support of C++20. . This package contains the Clang headers to develop extensions over - libclang1-11. + libclang1-12. -Package: libclang-common-11-dev +Package: libclang-common-12-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${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 @@ -165,10 +165,10 @@ Description: Clang library - Common development package This package contains the Clang generic headers and some libraries (profiling, etc). -Package: libclang-cpp11 +Package: libclang-cpp12 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: C++ interface to the Clang library Clang project is a C, C++, Objective C and Objective C++ front-end @@ -186,14 +186,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-cpp11-dev +Package: libclang-cpp12-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-cpp11 (= ${binary:Version}) -# Move of libclang-cpp.so into libclang-cpp11.dev -Breaks: libclang-11-dev (<< 1:11~++20200124010400+805c157e8ae-1~exp1) -Replaces: libclang-11-dev (<< 1:11~++20200124010400+805c157e8ae-1~exp1) + libclang-cpp12 (= ${binary:Version}) +# Move of libclang-cpp.so into libclang-cpp12.dev Description: C++ interface to the Clang library 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 @@ -211,13 +209,13 @@ Description: C++ interface to the Clang library Clang-based development tools. . This package contains the Clang headers to develop extensions over - libclang-cpp11. + libclang-cpp12. -Package: libfuzzer-11-dev +Package: libfuzzer-12-dev Architecture: linux-any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-12 (= ${binary:Version}) Description: Library for coverage-guided fuzz testing LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing of other libraries. @@ -235,10 +233,10 @@ Description: Library for coverage-guided fuzz testing instrumentation. -Package: python3-clang-11 +Package: python3-clang-12 Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-11-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-12-dev Replaces: python-clang-x.y, Conflicts: python-clang-x.y Provides: python-clang-x.y @@ -252,7 +250,7 @@ Description: Clang Python Bindings . This binding package provides access to the Clang compiler and libraries. -Package: clang-11-examples +Package: clang-12-examples Architecture: any Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -268,7 +266,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm11 +Package: libllvm12 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -281,11 +279,11 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: llvm-11 +Package: llvm-12 Architecture: any -Suggests: llvm-11-doc -Depends: llvm-11-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-11-dev +Suggests: llvm-12-doc +Depends: llvm-12-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-12-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 @@ -309,7 +307,7 @@ Description: Modular compiler and toolchain technologies a young scheme front-end, and Java support is in development. LLVM can generate code for X96, SparcV10, PowerPC or many other architectures. -Package: llvm-11-runtime +Package: llvm-12-runtime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: binfmt-support @@ -329,11 +327,11 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-11-dev +Package: llvm-12-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, - llvm-11 (= ${binary:Version}), libllvm11 (= ${binary:Version}), libtinfo-dev, - llvm-11-tools (= ${binary:Version}), libclang-cpp11 (= ${binary:Version}), libz3-dev + llvm-12 (= ${binary:Version}), libllvm12 (= ${binary:Version}), libtinfo-dev, + llvm-12-tools (= ${binary:Version}), libclang-cpp12 (= ${binary:Version}), libz3-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 @@ -350,7 +348,7 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: llvm-11-tools +Package: llvm-12-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, python3-pygments, python3-yaml, @@ -370,11 +368,11 @@ Description: Modular compiler and toolchain technologies, tools . This package provides tools for testing. -Package: libllvm-11-ocaml-dev +Package: libllvm-12-ocaml-dev Section: ocaml Architecture: amd64 arm64 armhf i386 ppc64el s390x -Suggests: llvm-11-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-11-dev (= ${binary:Version}) +Suggests: llvm-12-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-12-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev Conflicts: libllvm-x.y-ocaml-dev Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev @@ -393,7 +391,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-11-doc +Package: llvm-12-doc Section: doc Architecture: all Depends: ${misc:Depends}, libjs-jquery, libjs-underscore @@ -412,10 +410,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-11-examples +Package: llvm-12-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-11-dev (>= ${source:Version}), llvm-11-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-12-dev (>= ${source:Version}), llvm-12-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 @@ -435,20 +433,20 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- -Package: lld-11 +Package: lld-12 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${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-11 +Package: liblld-12 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: LLVM-based linker, library @@ -458,12 +456,12 @@ Description: LLVM-based linker, library . This package contains the LLD runtime library. -Package: liblld-11-dev +Package: liblld-12-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lld-11 (= ${binary:Version}), - liblld-11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lld-12 (= ${binary:Version}), + liblld-12 (= ${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 @@ -475,21 +473,21 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- -Package: lldb-11 +Package: lldb-12 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm11 (= ${binary:Version}), llvm-11-dev, - python3-lldb-11 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}), llvm-12-dev, + python3-lldb-12 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-11 +Package: liblldb-12 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm12 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: Next generation, high-performance debugger, library @@ -499,11 +497,11 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: python3-lldb-11 +Package: python3-lldb-12 Section: python Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-11 (= ${binary:Version}), python3-six +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-12 (= ${binary:Version}), python3-six Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y Provides: python3-lldb-x.y @@ -515,11 +513,11 @@ Description: Next generation, high-performance debugger, python3 lib . This binding package provides access to lldb. -Package: liblldb-11-dev +Package: liblldb-12-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-12 (= ${binary:Version}) 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 @@ -533,11 +531,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-11-dev +Package: libomp-12-dev Section: libdevel Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 -Depends: libomp5-11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: libomp-11-doc +Depends: libomp5-12 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libomp-12-doc Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev @@ -547,7 +545,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-11 +Package: libomp5-12 Multi-Arch: same Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 Depends: ${shlibs:Depends}, ${misc:Depends} @@ -560,7 +558,7 @@ Description: LLVM OpenMP runtime linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp-11-doc +Package: libomp-12-doc Section: doc Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery @@ -575,7 +573,7 @@ Description: LLVM OpenMP runtime - Documentation # ------------- libcxx ------------- -Package: libc++1-11 +Package: libc++1-12 Section: libs Architecture: any Multi-Arch: same @@ -599,11 +597,11 @@ Description: LLVM C++ Standard library as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-11-dev +Package: libc++-12-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-11 (= ${binary:Version}), ${misc:Depends} +Depends: libc++1-12 (= ${binary:Version}), ${misc:Depends} Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev @@ -623,7 +621,7 @@ Description: LLVM C++ Standard library (development files) # ------------- libcxxabi ------------- -Package: libc++abi1-11 +Package: libc++abi1-12 Section: libs Architecture: any Multi-Arch: same @@ -642,11 +640,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-11-dev +Package: libc++abi-12-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++abi1-11 (= ${binary:Version}), ${misc:Depends} +Depends: libc++abi1-12 (= ${binary:Version}), ${misc:Depends} Breaks: libc++abi-dev (<= 44) Provides: libc++abi-x.y-dev Conflicts: libc++abi-x.y-dev diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index 873fb699..8bd0dfda 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_11~++20200326111000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer +Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/tools/scan-build/libexec/ccc-analyzer -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer +--- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/clang/tools/scan-build/libexec/ccc-analyzer ++++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer @@ -90,7 +90,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++-11'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-12'; } $IsCXX = 1 } @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/scan- $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-11'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-12'; } $IsCXX = 0 } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 4f356634..f464b4ae 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -4,42 +4,42 @@ clang/tools/clang-format/clang-format.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -Index: llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb.orig/clang/tools/clang-format/clang-format-diff.py -+++ llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py +--- llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py @@ -58,7 +58,7 @@ def main(): parser.add_argument('-style', help='formatting style to apply (LLVM, GNU, Google, Chromium, ' 'Microsoft, Mozilla, WebKit)') - parser.add_argument('-binary', default='clang-format', -+ parser.add_argument('-binary', default='clang-format-11', ++ parser.add_argument('-binary', default='clang-format-12', help='location of binary to use for clang-format') args = parser.parse_args() -Index: llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb.orig/clang/tools/clang-format/clang-format.el -+++ llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format.el +--- llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format.el @@ -37,7 +37,7 @@ :group 'tools) (defcustom clang-format-executable - (or (executable-find "clang-format") -+ (or (executable-find "clang-format-11") ++ (or (executable-find "clang-format-12") "clang-format") "Location of the clang-format executable. -Index: llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb.orig/clang/tools/clang-format/clang-format.py -+++ llvm-toolchain-snapshot_11~++20200508112032+9c198b550eb/clang/tools/clang-format/clang-format.py +--- llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_12~++20200508122032+9c198b550eb/clang/tools/clang-format/clang-format.py @@ -48,7 +48,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-11' ++binary = 'clang-format-12' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path') diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index 11d3307d..014ef617 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,17 +1,17 @@ -Index: llvm-toolchain-snapshot_11~++20200423113502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_12~++20200423123502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200423113502+bbb7921da97.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_11~++20200423113502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +--- llvm-toolchain-snapshot_12~++20200423123502+bbb7921da97.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-snapshot_12~++20200423123502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py @@ -186,10 +186,10 @@ def main(): action='store_true', help='allow alpha checkers from ' 'clang-analyzer.') parser.add_argument('-clang-tidy-binary', metavar='PATH', - default='clang-tidy', -+ default='clang-tidy-11', ++ default='clang-tidy-12', help='path to clang-tidy binary') parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', - default='clang-apply-replacements', -+ default='clang-apply-replacements-11', ++ default='clang-apply-replacements-12', help='path to clang-apply-replacements binary') parser.add_argument('-checks', default=None, help='checks filter, when not specified, use clang-tidy ' diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff index fecb8ead..a6132063 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -1,12 +1,12 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/scan-view/bin/scan-view +--- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-view/bin/scan-view @@ -28,6 +28,7 @@ kDefaultPort = 8181 kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-11' ++BASE_DIR = '/usr/share/clang/scan-view-12' def url_is_up(url): diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff index 285198e7..4af626e2 100644 --- a/debian/patches/lldb-libname.diff +++ b/debian/patches/lldb-libname.diff @@ -2,16 +2,16 @@ lldb/scripts/Python/finishSwigPythonLLDB.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_11~svn3311515/lldb/scripts/Python/finishSwigPythonLLDB.py +Index: llvm-toolchain-snapshot_12~svn3312515/lldb/scripts/Python/finishSwigPythonLLDB.py =================================================================== ---- llvm-toolchain-snapshot_11~svn3311515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py -+++ llvm-toolchain-snapshot_11~svn3311515/lldb/scripts/Python/finishSwigPythonLLDB.py +--- llvm-toolchain-snapshot_12~svn3312515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py ++++ llvm-toolchain-snapshot_12~svn3312515/lldb/scripts/Python/finishSwigPythonLLDB.py @@ -443,7 +443,7 @@ def make_symlink_liblldb( if eOSType == utilsOsType.EnumOsType.Darwin: strLibFileExtn = ".dylib" else: - strLibFileExtn = ".so" -+ strLibFileExtn = "-11.so" ++ strLibFileExtn = "-12.so" strSrc = os.path.join(vstrLldbLibDir, "liblldb" + strLibFileExtn) bOk, strErrMsg = make_symlink( diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch index 3c90b3e0..2e5a8f6d 100644 --- a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch +++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch @@ -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_11~++20200326111000+4673699a470/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +--- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -35,6 +35,7 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 69d8d8c1..0cd1ec91 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -2,16 +2,16 @@ clang/bindings/python/clang/cindex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/bindings/python/clang/cindex.py =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/bindings/python/clang/cindex.py -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/bindings/python/clang/cindex.py +--- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/clang/bindings/python/clang/cindex.py ++++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/bindings/python/clang/cindex.py @@ -4160,7 +4160,7 @@ class Config(object): elif name == 'Windows': file = 'libclang.dll' else: - file = 'libclang.so' -+ file = 'libclang-11.so' ++ file = 'libclang-12.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 70726013..0570826e 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -2,16 +2,16 @@ clang/tools/scan-build/bin/scan-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-build/bin/scan-build =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/tools/scan-build/bin/scan-build +--- llvm-toolchain-snapshot_12~++20200326122000+4673699a470.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_12~++20200326122000+4673699a470/clang/tools/scan-build/bin/scan-build @@ -1478,7 +1478,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-11/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-12/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 diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 811ca4f1..3af64e35 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -1,10 +1,10 @@ #!/bin/sh -ORIG_VERSION=9 -TARGET_VERSION=10 -ORIG_VERSION_2=9_0 -TARGET_VERSION_2=10_0 -ORIG_VERSION_3=90 -TARGET_VERSION_3=100 +ORIG_VERSION=11 +TARGET_VERSION=12 +ORIG_VERSION_2=11_0 +TARGET_VERSION_2=12_0 +ORIG_VERSION_3=110 +TARGET_VERSION_3=120 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 debian/unpack.sh` for F in $LIST; do diff --git a/debian/tests/control b/debian/tests/control index cfa1155d..a94e7584 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,7 +2,7 @@ Test-Command: bash -v ./debian/qualify-clang.sh Depends: @, cmake, g++, file, dpkg-dev, binfmt-support # Comment the dbgsym package because of bug #917528 # dbgsym packages not being available in testing -# clang-11-dbgsym, libclang1-11-dbgsym +# clang-12-dbgsym, libclang1-12-dbgsym Restrictions: allow-stderr Tests: integration-test-suite-test @@ -10,10 +10,10 @@ Depends: @, cmake, libstdc++-9-dev, g++ Restrictions: allow-stderr Tests: cmake-test -Depends: gcc, build-essential, cmake, llvm-11-dev, libclang-common-11-dev +Depends: gcc, build-essential, cmake, llvm-12-dev, libclang-common-12-dev Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" -Depends: python3-lldb-11 +Depends: python3-lldb-12 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" -Depends: python3-clang-11 +Depends: python3-clang-12 diff --git a/debian/unpack.sh b/debian/unpack.sh index 515955bb..5af2885a 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,6 +1,6 @@ set -e ORIG_VERSION=snapshot -MAJOR_VERSION=11 # 8.0.1 +MAJOR_VERSION=12 # 8.0.1 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` VERSION=$REV