From 5eba40cb2a40c9fa0468f6009e09ab737cd6b3f7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 9 Dec 2019 17:29:47 +0100 Subject: [PATCH] Revert "Bump debhelper from old 9 to 12." This reverts commit 5dc1a03a77d43cc350585c493bf91b0b0bedd041. --- debian/compat | 2 +- debian/control | 35 ++++++++++++++++++++++++++++++++++- debian/rules | 5 +---- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/debian/compat b/debian/compat index 48082f72..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -12 +9 diff --git a/debian/control b/debian/control index acfaf086..dfbbe8ac 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Rules-Requires-Root: no Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru -Build-Depends: debhelper (>= 12~), cmake, chrpath, texinfo, sharutils, +Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9), lsb-release, patchutils, diffstat, xz-utils, python3-dev, libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), @@ -26,6 +26,8 @@ Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 9 Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/9 +# ------------- clang ------------- + Package: clang-9 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, @@ -194,6 +196,7 @@ Description: C++ interface to the Clang library locations with elements within the AST, and other facilities that support Clang-based development tools. + Package: libfuzzer-9-dev Architecture: linux-any Section: libdevel @@ -214,6 +217,7 @@ Description: Library for coverage-guided fuzz testing coverage information for libFuzzer is provided by LLVM's SanitizerCoverage instrumentation. + Package: python-clang-9 Section: python Architecture: any @@ -231,6 +235,7 @@ Description: Clang Python Bindings . This binding package provides access to the Clang compiler and libraries. + Package: clang-9-examples Architecture: any Section: doc @@ -245,6 +250,8 @@ Description: Clang examples . This package contains the Clang examples. +# ------------- LLVM ------------- + Package: libllvm9 Architecture: any Section: libs @@ -333,6 +340,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, python3, python-pygments, python-yaml, python3-pygments, python3-yaml +# Because of yaml-bench Breaks: libclang-common-9-dev (<< 9.0.1~+rc1-1~exp2) Replaces: libclang-common-9-dev (<< 9.0.1~+rc1-1~exp2) Description: Modular compiler and toolchain technologies, tools @@ -412,8 +420,12 @@ Description: Modular compiler and toolchain technologies, examples This package contains examples for using LLVM, both in developing extensions to LLVM and in using it to compile code. + +# ------------- lld ------------- + Package: lld-9 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 +# ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: LLVM-based linker @@ -423,6 +435,7 @@ Description: LLVM-based linker Package: liblld-9 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 +# ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -436,6 +449,7 @@ Description: LLVM-based linker, library Package: liblld-9-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m69k powerpcspe ppc64 sh4 sparc64 x32 +# ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-9 (= ${binary:Version}), liblld-9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -446,8 +460,12 @@ Description: LLVM-based linker, header files . This package provides the header files to build extension over lld. + +# ------------- lldb ------------- + Package: lldb-9 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m69k sh4 x32 +# ia64 hurd powerpc powerpcspe ppc64 alpha sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}), llvm-9-dev, python-lldb-9 Pre-Depends: ${misc:Pre-Depends} @@ -458,6 +476,7 @@ Description: Next generation, high-performance debugger Package: liblldb-9 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m69k sh4 x32 +# ia64 hurd powerpc powerpcspe ppc64 alpha sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs @@ -471,6 +490,7 @@ Description: Next generation, high-performance debugger, library Package: python-lldb-9 Section: python Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m69k sh4 x32 +# ia64 hurd powerpc powerpcspe ppc64 alpha sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-9, python3, python3-six Conflicts: python-lldb-x.y Replaces: python-lldb-x.y @@ -483,9 +503,11 @@ Description: Next generation, high-performance debugger, python lib . This binding package provides access to lldb. + Package: python3-lldb-9 Section: python Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m69k sh4 x32 +# ia64 hurd powerpc powerpcspe ppc64 alpha sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-9, python3-six Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y @@ -498,9 +520,11 @@ Description: Next generation, high-performance debugger, python3 lib . This binding package provides access to lldb. + Package: liblldb-9-dev Section: libdevel Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m69k sh4 x32 +# ia64 hurd powerpc powerpcspe ppc64 alpha sparc64 have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-9 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files @@ -510,6 +534,11 @@ Description: Next generation, high-performance debugger, header files . This package provides the header files to build extension over lldb. + +# ------------- openmp ------------- +# 44 because it was the first version in which openmp & libc++ have been +# managed in llvm-defaults + Package: libomp-9-dev Section: libdevel Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 @@ -550,6 +579,8 @@ Description: LLVM OpenMP runtime - Documentation . This package contains the documentation of this package. +# ------------- libcxx ------------- + Package: libc++1-9 Section: libs Architecture: any @@ -596,6 +627,8 @@ Description: LLVM C++ Standard library (development files) as exception objects, rtti and memory allocation. * Extensive unit tests. +# ------------- libcxxabi ------------- + Package: libc++abi1-9 Section: libs Architecture: any diff --git a/debian/rules b/debian/rules index 3dac23c9..438f276a 100755 --- a/debian/rules +++ b/debian/rules @@ -747,7 +747,7 @@ else rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake endif endif - dh_install + dh_install --fail-missing override_dh_installdeb: # Managed by the package @@ -857,6 +857,3 @@ override_dh_auto_clean: fi .PHONY: override_dh_strip preconfigure debian-full-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build - -override_dh_missing: - dh_missing --fail-missing