From f16985f2ce5ed6f7879a32e5a8a1ea9e1b5fea76 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 28 Jul 2021 18:47:20 +0200 Subject: [PATCH] update of 13 => 14 --- debian/changelog | 2 +- debian/control | 166 +++++++++--------- .../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 +- .../scan-build-py-fix-analyze-path.diff | 10 +- .../scan-build-py-fix-default-bin.diff | 8 +- debian/tests/cmake-test | 2 +- debian/tests/control | 8 +- debian/unpack.sh | 2 +- 15 files changed, 138 insertions(+), 142 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83cf8b40..74e44260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:13~++20210715093511+afc760ef3527-1~exp2) unstable; urgency=medium +llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; urgency=medium * revert the s390 as it is probably fixed diff --git a/debian/control b/debian/control index 364acf62..fd48c508 100644 --- a/debian/control +++ b/debian/control @@ -28,16 +28,14 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot # ------------- clang ------------- -Package: clang-13 +Package: clang-14 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang-common-13-dev (= ${binary:Version}), - libclang1-13 (= ${binary:Version}), libc6-dev, binutils + ${dep:devlibs-objc}, libclang-common-14-dev (= ${binary:Version}), + libclang1-14 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-13-dev, python3, libomp-13-dev -Suggests: clang-13-doc -Breaks: llvm-13-dev (<< 1:13~++20210129063721) -Replaces: llvm-13-dev (<< 1:13~++20210129063721) +Recommends: llvm-14-dev, python3, libomp-14-dev +Suggests: clang-14-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 @@ -46,9 +44,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-13 +Package: clang-tools-14 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-13 (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-14 (= ${binary:Version}), python3 Description: clang-based tools for C/C++ developments Clang project is a C, C++, Objective C and Objective C++ front-end @@ -60,10 +58,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-13 +Package: clang-format-14 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm13 (= ${binary:Version}) + libllvm14 (= ${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 @@ -76,21 +74,21 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: clang-tidy-13 +Package: clang-tidy-14 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm13 (= ${binary:Version}), libclang-common-13-dev, - clang-tools-13, python3-yaml + libllvm14 (= ${binary:Version}), libclang-common-14-dev, + clang-tools-14, 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-13 +Package: clangd-14 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libclang-common-13-dev (= ${binary:Version}) + libclang-common-14-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 @@ -101,7 +99,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-13-doc +Package: clang-14-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax @@ -115,7 +113,7 @@ Description: C, C++ and Objective-C compiler - Documentation . This package contains the documentation. -Package: libclang1-13 +Package: libclang1-14 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -136,12 +134,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-13-dev +Package: libclang-14-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang1-13 (= ${binary:Version}), - libclang-common-13-dev (= ${binary:Version}) + ${dep:devlibs-objc}, libclang1-14 (= ${binary:Version}), + libclang-common-14-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 @@ -151,12 +149,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-13. + libclang1-14. -Package: libclang-common-13-dev +Package: libclang-common-14-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm14 (= ${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 @@ -168,10 +166,10 @@ Description: Clang library - Common development package This package contains the Clang generic headers and some libraries (profiling, etc). -Package: libclang-cpp13 +Package: libclang-cpp14 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm14 (= ${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 @@ -189,12 +187,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-cpp13-dev +Package: libclang-cpp14-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-cpp13 (= ${binary:Version}) -# Move of libclang-cpp.so into libclang-cpp13.dev + libclang-cpp14 (= ${binary:Version}) +# Move of libclang-cpp.so into libclang-cpp14.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 @@ -215,10 +213,10 @@ Description: C++ interface to the Clang library linker at build time. -Package: libfuzzer-13-dev +Package: libfuzzer-14-dev Architecture: linux-any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-13 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-14 (= ${binary:Version}) Description: Library for coverage-guided fuzz testing LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing of other libraries. @@ -236,10 +234,10 @@ Description: Library for coverage-guided fuzz testing instrumentation. -Package: python3-clang-13 +Package: python3-clang-14 Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-13-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-14-dev Replaces: python-clang-x.y, Conflicts: python-clang-x.y Provides: python-clang-x.y @@ -253,7 +251,7 @@ Description: Clang Python Bindings . This binding package provides access to the Clang compiler and libraries. -Package: clang-13-examples +Package: clang-14-examples Architecture: any Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -269,7 +267,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm13 +Package: libllvm14 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -282,11 +280,9 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: llvm-13-linker-tools +Package: llvm-14-linker-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: llvm-13-dev (<< 1:13~++20210129063721), clang-13 (<< 1:13~++20210129063721) -Replaces: llvm-13-dev (<< 1:13~++20210129063721), clang-13 (<< 1:13~++20210129063721) Description: Modular compiler and toolchain technologies - Plugins LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -294,13 +290,13 @@ Description: Modular compiler and toolchain technologies - Plugins . This package contains the LLVMgold and LLVMPolly linker plugins. -Package: llvm-13 +Package: llvm-14 Architecture: any -Suggests: llvm-13-doc -Depends: llvm-13-runtime (= ${binary:Version}), - llvm-13-linker-tools (= ${binary:Version}), +Suggests: llvm-14-doc +Depends: llvm-14-runtime (= ${binary:Version}), + llvm-14-linker-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-13-dev +Recommends: llvm-14-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 @@ -324,7 +320,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-13-runtime +Package: llvm-14-runtime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: binfmt-support @@ -344,11 +340,11 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-13-dev +Package: llvm-14-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, - llvm-13 (= ${binary:Version}), libllvm13 (= ${binary:Version}), libtinfo-dev, - llvm-13-tools (= ${binary:Version}), libclang-cpp13 (= ${binary:Version}), + llvm-14 (= ${binary:Version}), libllvm14 (= ${binary:Version}), libtinfo-dev, + llvm-14-tools (= ${binary:Version}), libclang-cpp14 (= ${binary:Version}), libz3-dev, libxml2-dev Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build @@ -366,7 +362,7 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: llvm-13-tools +Package: llvm-14-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, python3-pygments, python3-yaml, @@ -386,11 +382,11 @@ Description: Modular compiler and toolchain technologies, tools . This package provides tools for testing. -Package: libllvm-13-ocaml-dev +Package: libllvm-14-ocaml-dev Section: ocaml Architecture: amd64 arm64 armhf ppc64el s390x riscv64 -Suggests: llvm-13-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-13-dev (= ${binary:Version}) +Suggests: llvm-14-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-14-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev Conflicts: libllvm-x.y-ocaml-dev Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev @@ -409,7 +405,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-13-doc +Package: llvm-14-doc Section: doc Architecture: all Depends: ${misc:Depends}, libjs-jquery, libjs-underscore @@ -428,10 +424,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-13-examples +Package: llvm-14-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-13-dev (>= ${source:Version}), llvm-13-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-14-dev (>= ${source:Version}), llvm-14-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 @@ -451,20 +447,20 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- -Package: lld-13 +Package: lld-14 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm14 (= ${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-13 +Package: liblld-14 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm14 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: LLVM-based linker, library @@ -474,12 +470,12 @@ Description: LLVM-based linker, library . This package contains the LLD runtime library. -Package: liblld-13-dev +Package: liblld-14-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lld-13 (= ${binary:Version}), - liblld-13 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lld-14 (= ${binary:Version}), + liblld-14 (= ${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 @@ -491,21 +487,21 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- -Package: lldb-13 +Package: lldb-14 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}), llvm-13-dev, - python3-lldb-13 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm14 (= ${binary:Version}), llvm-14-dev, + python3-lldb-14 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-13 +Package: liblldb-14 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm14 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: Next generation, high-performance debugger, library @@ -515,11 +511,11 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: python3-lldb-13 +Package: python3-lldb-14 Section: python Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-13 (= ${binary:Version}), python3-six +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-14 (= ${binary:Version}), python3-six Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y Provides: python3-lldb-x.y @@ -531,11 +527,11 @@ Description: Next generation, high-performance debugger, python3 lib . This binding package provides access to lldb. -Package: liblldb-13-dev +Package: liblldb-14-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 riscv64 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-13 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-14 (= ${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 @@ -549,11 +545,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-13-dev +Package: libomp-14-dev Section: libdevel Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 -Depends: libomp5-13 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: libomp-13-doc +Depends: libomp5-14 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libomp-14-doc Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev @@ -563,7 +559,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-13 +Package: libomp5-14 Multi-Arch: same Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} @@ -576,7 +572,7 @@ Description: LLVM OpenMP runtime linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp-13-doc +Package: libomp-14-doc Section: doc Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery @@ -591,7 +587,7 @@ Description: LLVM OpenMP runtime - Documentation # ------------- libcxx ------------- -Package: libc++1-13 +Package: libc++1-14 Section: libs Architecture: any Multi-Arch: same @@ -615,11 +611,11 @@ Description: LLVM C++ Standard library as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-13-dev +Package: libc++-14-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-13 (= ${binary:Version}), ${misc:Depends} +Depends: libc++1-14 (= ${binary:Version}), ${misc:Depends} Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev @@ -639,7 +635,7 @@ Description: LLVM C++ Standard library (development files) # ------------- libcxxabi ------------- -Package: libc++abi1-13 +Package: libc++abi1-14 Section: libs Architecture: any Multi-Arch: same @@ -658,11 +654,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-13-dev +Package: libc++abi-14-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++abi1-13 (= ${binary:Version}), ${misc:Depends} +Depends: libc++abi1-14 (= ${binary:Version}), ${misc:Depends} Breaks: libc++abi-dev (<= 44) Provides: libc++abi-x.y-dev Conflicts: libc++abi-x.y-dev @@ -678,14 +674,14 @@ Description: LLVM low level support for a standard C++ library (development file # ------------- libclc ------------- -Package: libclc-13 +Package: libclc-14 Section: libs Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, - libclc-13-dev (= ${binary:Version}), - libclang-common-13-dev, + libclc-14-dev (= ${binary:Version}), + libclang-common-14-dev, Breaks: libclc-amdgcn, libclc-ptx, libclc-r600 Provides: libclc-x.y Conflicts: libclc-x.y @@ -697,7 +693,7 @@ Description: OpenCL C language implementation - platform support This package contains support for the amdgcn (AMD GPU), PTX and r600 platforms. -Package: libclc-13-dev +Package: libclc-14-dev Section: libdevel Architecture: all Multi-Arch: foreign diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index 053cc8d0..90a6f118 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_13~++20200326132000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer +Index: llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer =================================================================== ---- llvm-toolchain-snapshot_13~++20200326132000+4673699a470.orig/clang/tools/scan-build/libexec/ccc-analyzer -+++ llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-build/libexec/ccc-analyzer +--- llvm-toolchain-snapshot_14~++20200326142000+4673699a470.orig/clang/tools/scan-build/libexec/ccc-analyzer ++++ llvm-toolchain-snapshot_14~++20200326142000+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++-13'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-14'; } $IsCXX = 1 } @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan- $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-13'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-14'; } $IsCXX = 0 } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index e4f299b9..2894b8ab 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_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb.orig/clang/tools/clang-format/clang-format-diff.py -+++ llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format-diff.py +--- llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_14~++20200508142032+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-13', ++ parser.add_argument('-binary', default='clang-format-14', help='location of binary to use for clang-format') args = parser.parse_args() -Index: llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format.el +Index: llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb.orig/clang/tools/clang-format/clang-format.el -+++ llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format.el +--- llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_14~++20200508142032+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-13") ++ (or (executable-find "clang-format-14") "clang-format") "Location of the clang-format executable. -Index: llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb.orig/clang/tools/clang-format/clang-format.py -+++ llvm-toolchain-snapshot_13~++20200508132032+9c198b550eb/clang/tools/clang-format/clang-format.py +--- llvm-toolchain-snapshot_14~++20200508142032+9c198b550eb.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_14~++20200508142032+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-13' ++binary = 'clang-format-14' 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 0c53ce89..12720c1c 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_13~++20200423133502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_14~++20200423143502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_13~++20200423133502+bbb7921da97.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_13~++20200423133502+bbb7921da97/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +--- llvm-toolchain-snapshot_14~++20200423143502+bbb7921da97.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-snapshot_14~++20200423143502+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-13', ++ default='clang-tidy-14', help='path to clang-tidy binary') parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', - default='clang-apply-replacements', -+ default='clang-apply-replacements-13', ++ default='clang-apply-replacements-14', 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 b834691c..a85929ed 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_13~++20200326132000+4673699a470/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_13~++20200326132000+4673699a470.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-view/bin/scan-view +--- llvm-toolchain-snapshot_14~++20200326142000+4673699a470.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan-view/bin/scan-view @@ -28,6 +28,7 @@ kDefaultPort = 8181 kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-13' ++BASE_DIR = '/usr/share/clang/scan-view-14' def url_is_up(url): diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb-libname.diff index edeb25e3..3416ea38 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_13~svn3313515/lldb/scripts/Python/finishSwigPythonLLDB.py +Index: llvm-toolchain-snapshot_14~svn3314515/lldb/scripts/Python/finishSwigPythonLLDB.py =================================================================== ---- llvm-toolchain-snapshot_13~svn3313515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py -+++ llvm-toolchain-snapshot_13~svn3313515/lldb/scripts/Python/finishSwigPythonLLDB.py +--- llvm-toolchain-snapshot_14~svn3314515.orig/lldb/scripts/Python/finishSwigPythonLLDB.py ++++ llvm-toolchain-snapshot_14~svn3314515/lldb/scripts/Python/finishSwigPythonLLDB.py @@ -443,7 +443,7 @@ def make_symlink_liblldb( if eOSType == utilsOsType.EnumOsType.Darwin: strLibFileExtn = ".dylib" else: - strLibFileExtn = ".so" -+ strLibFileExtn = "-13.so" ++ strLibFileExtn = "-14.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 66694a04..70a5de3e 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_13~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_14~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- llvm-toolchain-snapshot_13~++20201021041841+fa5fa63fd14.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -+++ llvm-toolchain-snapshot_13~++20201021041841+fa5fa63fd14/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +--- llvm-toolchain-snapshot_14~++20201021041841+fa5fa63fd14.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_14~++20201021041841+fa5fa63fd14/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 8dc00a73..5d6d8810 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_13~++20200326132000+4673699a470/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/bindings/python/clang/cindex.py =================================================================== ---- llvm-toolchain-snapshot_13~++20200326132000+4673699a470.orig/clang/bindings/python/clang/cindex.py -+++ llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/bindings/python/clang/cindex.py +--- llvm-toolchain-snapshot_14~++20200326142000+4673699a470.orig/clang/bindings/python/clang/cindex.py ++++ llvm-toolchain-snapshot_14~++20200326142000+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-13.so' ++ file = 'libclang-14.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 2f7ed26e..b9ecd7b5 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_13~++20200326132000+4673699a470/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_14~++20200326142000+4673699a470/clang/tools/scan-build/bin/scan-build =================================================================== ---- llvm-toolchain-snapshot_13~++20200326132000+4673699a470.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-snapshot_13~++20200326132000+4673699a470/clang/tools/scan-build/bin/scan-build +--- llvm-toolchain-snapshot_14~++20200326142000+4673699a470.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_14~++20200326142000+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-13/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-14/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/patches/scan-build-py-fix-analyze-path.diff b/debian/patches/scan-build-py-fix-analyze-path.diff index 10374e55..ba9278d0 100644 --- a/debian/patches/scan-build-py-fix-analyze-path.diff +++ b/debian/patches/scan-build-py-fix-analyze-path.diff @@ -1,15 +1,15 @@ -Index: llvm-toolchain-snapshot_13~++20210622111349+b259740801d3/clang/tools/scan-build-py/lib/libscanbuild/analyze.py +Index: llvm-toolchain-snapshot_14~++20210622111449+b259740801d3/clang/tools/scan-build-py/lib/libscanbuild/analyze.py =================================================================== ---- llvm-toolchain-snapshot_13~++20210622111349+b259740801d3.orig/clang/tools/scan-build-py/lib/libscanbuild/analyze.py -+++ llvm-toolchain-snapshot_13~++20210622111349+b259740801d3/clang/tools/scan-build-py/lib/libscanbuild/analyze.py +--- llvm-toolchain-snapshot_14~++20210622111449+b259740801d3.orig/clang/tools/scan-build-py/lib/libscanbuild/analyze.py ++++ llvm-toolchain-snapshot_14~++20210622111449+b259740801d3/clang/tools/scan-build-py/lib/libscanbuild/analyze.py @@ -39,8 +39,8 @@ from libscanbuild.shell import decode __all__ = ['scan_build', 'analyze_build', 'analyze_compiler_wrapper'] -COMPILER_WRAPPER_CC = 'analyze-cc' -COMPILER_WRAPPER_CXX = 'analyze-c++' -+COMPILER_WRAPPER_CC = '/usr/lib/llvm-13/libexec/analyze-cc' -+COMPILER_WRAPPER_CXX = '/usr/lib/llvm-13/libexec/analyze-c++' ++COMPILER_WRAPPER_CC = '/usr/lib/llvm-14/libexec/analyze-cc' ++COMPILER_WRAPPER_CXX = '/usr/lib/llvm-14/libexec/analyze-c++' CTU_EXTDEF_MAP_FILENAME = 'externalDefMap.txt' CTU_TEMP_DEFMAP_FOLDER = 'tmpExternalDefMaps' diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff index 2205e917..8224011a 100644 --- a/debian/patches/scan-build-py-fix-default-bin.diff +++ b/debian/patches/scan-build-py-fix-default-bin.diff @@ -1,13 +1,13 @@ -Index: llvm-toolchain-snapshot_13~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py +Index: llvm-toolchain-snapshot_14~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py =================================================================== ---- llvm-toolchain-snapshot_13~++20210717105643+f95d26006e06.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py -+++ llvm-toolchain-snapshot_13~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py +--- llvm-toolchain-snapshot_14~++20210717105643+f95d26006e06.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py ++++ llvm-toolchain-snapshot_14~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py @@ -266,7 +266,7 @@ def create_analyze_parser(from_build_com '--use-analyzer', metavar='', dest='clang', - default='clang', -+ default='clang-13', ++ default='clang-14', help="""'%(prog)s' uses the 'clang' executable relative to itself for static analysis. One can override this behavior with this option by using the 'clang' packaged with Xcode (on OS X) or from the PATH.""") diff --git a/debian/tests/cmake-test b/debian/tests/cmake-test index 34e13a2c..5aac605b 100755 --- a/debian/tests/cmake-test +++ b/debian/tests/cmake-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=13 +LLVM_VERSION=14 # this is taken from libjsoncpp package # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we diff --git a/debian/tests/control b/debian/tests/control index 3d98786d..b0dcd1cb 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,7 +2,7 @@ Test-Command: bash -v ./debian/qualify-clang.sh Depends: @, cmake, make, g++, file, dpkg-dev, binfmt-support # Comment the dbgsym package because of bug #917528 # dbgsym packages not being available in testing -# clang-13-dbgsym, libclang1-13-dbgsym +# clang-14-dbgsym, libclang1-14-dbgsym Restrictions: allow-stderr Tests: integration-test-suite-test @@ -10,10 +10,10 @@ Depends: @, cmake, make, g++, libstdc++-10-dev Restrictions: allow-stderr Tests: cmake-test -Depends: gcc, build-essential, cmake, llvm-13-dev, libclang-common-13-dev +Depends: gcc, build-essential, cmake, llvm-14-dev, libclang-common-14-dev Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" -Depends: python3-lldb-13 +Depends: python3-lldb-14 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" -Depends: python3-clang-13 +Depends: python3-clang-14 diff --git a/debian/unpack.sh b/debian/unpack.sh index 594366b7..6f86ed46 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,6 +1,6 @@ set -e ORIG_VERSION=snapshot -MAJOR_VERSION=13 # 8.0.1 +MAJOR_VERSION=14 # 8.0.1 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` VERSION=$REV