From 6feb36eaf1453948c703893728e5c06488a93a64 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 16 Jan 2019 15:41:01 +0100 Subject: [PATCH] prepare version 9 --- debian/README | 18 ++-- debian/changelog | 2 +- debian/control | 184 +++++++++++++++++----------------- debian/orig-tar.sh | 4 +- debian/prepare-new-release.sh | 12 +-- debian/rules | 16 +-- debian/tests/control | 2 +- 7 files changed, 119 insertions(+), 119 deletions(-) diff --git a/debian/README b/debian/README index 9f6e854b..afb2362b 100644 --- a/debian/README +++ b/debian/README @@ -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 8 release lives at in the "8" branch. +For example, the 9 release lives at in the "9" 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~svn268942. Depending on the current + branches/llvm-toolchain-snapshot_3.9~svn269942. 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 8 release +the branch name as the first argument. For example, to get the 9 release branch at - http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_80 + http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_90 you should use, - $ sh snapshot/debian/orig-tar.sh release_80 + $ sh snapshot/debian/orig-tar.sh release_90 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 8.0.1 release candidate rc3 at - http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_801/rc3 +get the 9.0.1 release candidate rc3 at + http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_901/rc3 you should use, - $ sh snapshot/debian/orig-tar.sh RELEASE_801 rc3 8.0.1 + $ sh snapshot/debian/orig-tar.sh RELEASE_901 rc3 9.0.1 For a stable release, the syntax is: - $ sh snapshot/debian/orig-tar.sh RELEASE_800 final 8.0 + $ sh snapshot/debian/orig-tar.sh RELEASE_900 final 9.0 Additional maintainer scripts diff --git a/debian/changelog b/debian/changelog index bdc5923c..938dae58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:8~svn350834-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:9~svn350834-1~exp1) experimental; urgency=medium * Silent a source lintian warning source: source-is-missing lldb/lit/Modules/ELF/Inputs/PT_LOAD-overlap-section.elf diff --git a/debian/control b/debian/control index 6eafb77e..edfe6937 100644 --- a/debian/control +++ b/debian/control @@ -11,14 +11,14 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, binutils-dev, libjsoncpp-dev, pkg-config, lcov, procps, help2man, zlib1g-dev, - g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], + g++-multilib [amd64 i396 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], libjs-mathjax, python-recommonmark, doxygen, gfortran, - ocaml-nox [amd64 arm64 armhf i386 ppc64el s390x], - ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x], - libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], - dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], -Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev + ocaml-nox [amd64 arm64 armhf i396 ppc64el s390x], + ocaml-findlib [amd64 arm64 armhf i396 ppc64el s390x], + libctypes-ocaml-dev [amd64 arm64 armhf i396 ppc64el s390x], + dh-ocaml [amd64 arm64 armhf i396 ppc64el s390x], +Build-Conflicts: oprofile, ocaml, libllvm-3.9-ocaml-dev, libllvm-3.9-ocaml-dev Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot @@ -26,14 +26,14 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot # ------------- clang ------------- -Package: clang-8 +Package: clang-9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang-common-8-dev (= ${binary:Version}), - libclang1-8 (= ${binary:Version}), libc6-dev, binutils + ${dep:devlibs-objc}, libclang-common-9-dev (= ${binary:Version}), + libclang1-9 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-8-dev, python, libomp-8-dev -Suggests: clang-8-doc +Recommends: llvm-9-dev, python, libomp-9-dev +Suggests: clang-9-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 @@ -42,9 +42,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-8 +Package: clang-tools-9 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-9 (= ${binary:Version}) Description: clang-based tools for C/C++ developments 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 @@ -56,10 +56,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-8 +Package: clang-format-9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - libllvm8 (= ${binary:Version}) + libllvm9 (= ${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 @@ -72,20 +72,20 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: clang-tidy-8 +Package: clang-tidy-9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - libllvm8 (= ${binary:Version}), libclang-common-8-dev, - clang-tools-8, python-yaml -Replaces: clang-modernize-8, clang-8 (<< 8~svn250696-1) -Breaks: clang-modernize-8, clang-8 (<< 8~svn250696-1) + 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) 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-8-doc +Package: clang-9-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax @@ -99,7 +99,7 @@ Description: C, C++ and Objective-C compiler - Documentation . This package contains the documentation. -Package: libclang1-8 +Package: libclang1-9 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -121,12 +121,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-8-dev +Package: libclang-9-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang1-8 (= ${binary:Version}), - libclang-common-8-dev (= ${binary:Version}) + ${dep:devlibs-objc}, libclang1-9 (= ${binary:Version}), + libclang-common-9-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 @@ -136,12 +136,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-8. + libclang1-9. -Package: libclang-common-8-dev +Package: libclang-common-9-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${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,10 +154,10 @@ Description: Clang library - Common development package (profiling, etc). -Package: libfuzzer-8-dev +Package: libfuzzer-9-dev Architecture: linux-any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-9 (= ${binary:Version}) Description: Library for coverage-guided fuzz testing LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing of other libraries. @@ -175,12 +175,12 @@ Description: Library for coverage-guided fuzz testing instrumentation. -Package: python-clang-8 +Package: python-clang-9 Section: python Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python -Replaces: python-clang-3.8, python-clang-3.9, python-clang-x.y -Breaks: python-clang-3.8, python-clang-3.9 +Replaces: python-clang-3.9, python-clang-3.9, python-clang-x.y +Breaks: python-clang-3.9, python-clang-3.9 Conflicts: python-clang-x.y Provides: python-clang-x.y Description: Clang Python Bindings @@ -194,7 +194,7 @@ Description: Clang Python Bindings This binding package provides access to the Clang compiler and libraries. -Package: clang-8-examples +Package: clang-9-examples Architecture: any Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} @@ -210,7 +210,7 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm8 +Package: libllvm9 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -225,11 +225,11 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: llvm-8 +Package: llvm-9 Architecture: any -Suggests: llvm-8-doc -Depends: llvm-8-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-8-dev +Suggests: llvm-9-doc +Depends: llvm-9-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Recommends: llvm-9-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 @@ -251,9 +251,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 X86, SparcV9, PowerPC or many other architectures. + generate code for X96, SparcV9, PowerPC or many other architectures. -Package: llvm-8-runtime +Package: llvm-9-runtime Architecture: any Depends: binfmt-support, ${shlibs:Depends}, ${misc:Depends} Description: Modular compiler and toolchain technologies, IR interpreter @@ -272,10 +272,10 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-8-dev +Package: llvm-9-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends}, - llvm-8 (= ${binary:Version}), libllvm8 (= ${binary:Version}), libtinfo-dev + llvm-9 (= ${binary:Version}), libllvm9 (= ${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 @@ -292,11 +292,11 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: llvm-8-tools +Package: llvm-9-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-pygments, python-yaml, - llvm-8-dev (= ${binary:Version}) + llvm-9-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 @@ -312,11 +312,11 @@ Description: Modular compiler and toolchain technologies, tools . This package provides tools for testing. -Package: libllvm-8-ocaml-dev +Package: libllvm-9-ocaml-dev Section: ocaml -Architecture: amd64 arm64 armhf i386 ppc64el s390x -Suggests: llvm-8-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-8-dev (= ${binary:Version}) +Architecture: amd64 arm64 armhf i396 ppc64el s390x +Suggests: llvm-9-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-9-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev Conflicts: libllvm-x.y-ocaml-dev Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev @@ -335,7 +335,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-8-doc +Package: llvm-9-doc Section: doc Architecture: all Depends: ${misc:Depends}, libjs-jquery, libjs-underscore @@ -354,10 +354,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-8-examples +Package: llvm-9-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-8-dev (>= ${source:Version}), llvm-8-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-9-dev (>= ${source:Version}), llvm-9-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 @@ -377,20 +377,20 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- -Package: lld-8 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +Package: lld-9 +Architecture: amd64 arm64 armel armhf i396 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i396 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${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-8 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +Package: liblld-9 +Architecture: amd64 arm64 armel armhf i396 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i396 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: LLVM-based linker, library @@ -400,12 +400,12 @@ Description: LLVM-based linker, library . This package contains the LLD runtime library. -Package: liblld-8-dev +Package: liblld-9-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 +Architecture: amd64 arm64 armel armhf i396 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i396 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lld-8 (= ${binary:Version}), - liblld-8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lld-9 (= ${binary:Version}), + liblld-9 (= ${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 @@ -417,25 +417,25 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- -Package: lldb-8 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k sh4 x32 +Package: lldb-9 +Architecture: amd64 arm64 armel armhf i396 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i396 s390 sparc hppa m69k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version}), llvm-8-dev, - python-lldb-8 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}), llvm-9-dev, + python-lldb-9 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-8 -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k sh4 x32 +Package: liblldb-9 +Architecture: amd64 arm64 armel armhf i396 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i396 s390 sparc hppa m69k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm8 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs -Replaces: lldb-8 (<= 8~svn215195-2) -Breaks: lldb-8 (<< 8~svn215195-2) +Replaces: lldb-9 (<= 9~svn215195-2) +Breaks: lldb-9 (<< 9~svn215195-2) Description: Next generation, high-performance debugger, library LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM @@ -443,12 +443,12 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: python-lldb-8 +Package: python-lldb-9 Section: python -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i396 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i396 s390 sparc hppa m69k 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.8, python-lldb-3.9, python-lldb-x.y +Conflicts: python-lldb-3.9, python-lldb-3.9, python-lldb-x.y Replaces: python-lldb-x.y Provides: python-lldb-x.y Pre-Depends: ${misc:Pre-Depends} @@ -460,13 +460,13 @@ Description: Next generation, high-performance debugger, python lib This binding package provides access to lldb. -Package: liblldb-8-dev +Package: liblldb-9-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i396 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i396 s390 sparc hppa m69k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-8 (= ${binary:Version}) -Replaces: lldb-8-dev (<= 8~svn215195-2) -Breaks: lldb-8-dev (<< 8~svn215195-2) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-9 (= ${binary:Version}) +Replaces: lldb-9-dev (<= 9~svn215195-2) +Breaks: lldb-9-dev (<< 9~svn215195-2) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files LLDB is a next generation, high-performance debugger. It is built as a set of @@ -480,11 +480,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-8-dev +Package: libomp-9-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 -Depends: libomp5-8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: libomp-8-doc +Architecture: amd64 arm64 armhf i396 mips64el ppc64el ppc64 +Depends: libomp5-9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libomp-9-doc Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev @@ -494,9 +494,9 @@ Description: LLVM OpenMP runtime - dev package linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp5-8 +Package: libomp5-9 Multi-Arch: same -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 +Architecture: amd64 arm64 armhf i396 mips64el ppc64el ppc64 Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libomp5 (<< 44) Provides: libomp-x.y @@ -507,7 +507,7 @@ Description: LLVM OpenMP runtime linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp-8-doc +Package: libomp-9-doc Section: doc Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery @@ -522,7 +522,7 @@ Description: LLVM OpenMP runtime - Documentation # ------------- libcxx ------------- -Package: libc++1-8 +Package: libc++1-9 Section: libs Architecture: any Multi-Arch: same @@ -546,11 +546,11 @@ Description: LLVM C++ Standard library as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-8-dev +Package: libc++-9-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-8 (= ${binary:Version}), ${misc:Depends} +Depends: libc++1-9 (= ${binary:Version}), ${misc:Depends} Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev @@ -570,7 +570,7 @@ Description: LLVM C++ Standard library (development files) # ------------- libcxxabi ------------- -Package: libc++abi1-8 +Package: libc++abi1-9 Section: libs Architecture: any Multi-Arch: same @@ -589,11 +589,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-8-dev +Package: libc++abi-9-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++abi1-8 (= ${binary:Version}), ${misc:Depends} +Depends: libc++abi1-9 (= ${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/orig-tar.sh b/debian/orig-tar.sh index ebaf07e2..4d2efcd7 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -19,8 +19,8 @@ set -e # sh 4.0/debian/orig-tar.sh RELEASE_40 rc1 SVN_BASE_URL=http://llvm.org/svn/llvm-project/ -MAJOR_VERSION=8 -CURRENT_VERSION=8 # Should be changed to 3.5.1 later +MAJOR_VERSION=9 +CURRENT_VERSION=9 # Should be changed to 3.5.1 later if test -n "$1"; then # http://llvm.org/svn/llvm-project/{cfe,llvm,compiler-rt,...}/branches/google/stable/ diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 661f1382..b4662904 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -1,10 +1,10 @@ #!/bin/sh -ORIG_VERSION=7 -TARGET_VERSION=8 -ORIG_VERSION_2=7_0 -TARGET_VERSION_2=8_0 -ORIG_VERSION_3=70 -TARGET_VERSION_3=80 +ORIG_VERSION=8 +TARGET_VERSION=9 +ORIG_VERSION_2=8_0 +TARGET_VERSION_2=9_0 +ORIG_VERSION_3=80 +TARGET_VERSION_3=90 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` for F in $LIST; do diff --git a/debian/rules b/debian/rules index b89ad3ed..7403953a 100755 --- a/debian/rules +++ b/debian/rules @@ -667,10 +667,10 @@ endif override_dh_makeshlibs: - dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:8~svn298832-1~)" -- -c4 - dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:8~svn298832-1~)" - dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:8~svn298832-1~)" - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION)) (>= 1:8~svn298832-1~)" + dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" -- -c4 + dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" + dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:9~svn298832-1~)" + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION)) (>= 1:9~svn298832-1~)" dh_makeshlibs --remaining-packages override_dh_shlibdeps: @@ -691,10 +691,10 @@ override_dh_strip: find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f ifeq (0, $(strip $(shell dpkg --compare-versions $(DH_VERSION) ge 9.20160114; echo $$?))) : # If we don't have the right version of debhelper, don't run the option - dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)' - dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)' - dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)' - dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg (<< 1:8~svn327768-1~)' + dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg (<< 1:9~svn327768-1~)' + dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg (<< 1:9~svn327768-1~)' + dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg (<< 1:9~svn327768-1~)' + dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg (<< 1:9~svn327768-1~)' endif # ifeq (${LLD_ENABLE},yes) # PATH=$(CURDIR)/:$$PATH dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg diff --git a/debian/tests/control b/debian/tests/control index 416d10da..88a1086c 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,5 +2,5 @@ Test-Command: bash -v ./debian/qualify-clang.sh Depends: @, cmake, g++, file, dpkg-dev # Comment the dbgsym package because of bug #917528 # dbgsym packages not being available in testing -# clang-8-dbgsym, libclang1-8-dbgsym +# clang-9-dbgsym, libclang1-9-dbgsym Restrictions: allow-stderr