From 608f891ab3e7e8400dca06c0d8e3c740b56a3539 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 15 Apr 2021 13:33:03 +0200 Subject: [PATCH] * Disable again LTO * Create a new package llvm-12-linker-tools: Contains the LLVMgold and LLVMPolly linker plugins. --- debian/changelog | 3 +++ debian/control | 19 ++++++++++++++++++- debian/llvm-X.Y-dev.install.in | 3 +-- debian/rules | 7 ++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1b539c8..93d48145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ llvm-toolchain-12 (1:12.0.0-3) UNRELEASED; urgency=medium [ Matthias Klose ] * Improve the clean rule + * Disable again LTO + * Create a new package llvm-12-linker-tools: + Contains the LLVMgold and LLVMPolly linker plugins. -- Sylvestre Ledru Thu, 15 Apr 2021 13:27:57 +0200 diff --git a/debian/control b/debian/control index 3f6f9db0..314a8d91 100644 --- a/debian/control +++ b/debian/control @@ -31,10 +31,13 @@ Package: clang-12 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, ${dep:devlibs-objc}, libclang-common-12-dev (= ${binary:Version}), + llvm-12-linker-tools (= ${binary:Version}), libclang1-12 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-12-dev, python3, libomp-12-dev Suggests: clang-12-doc +Breaks: llvm-12-dev (<< 1:12.0.0~++rc5-1ubuntu1) +Replaces: llvm-12-dev (<< 1:12.0.0~++rc5-1ubuntu1) 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 @@ -279,10 +282,24 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. +Package: llvm-12-linker-tools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: llvm-12-dev (<< 1:12.0.0~++rc5-1ubuntu2), clang-12 (<< 1:12.0.0~++rc5-1ubuntu2) +Replaces: llvm-12-dev (<< 1:12.0.0~++rc5-1ubuntu2), clang-12 (<< 1:12.0.0~++rc5-1ubuntu2) +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 + compiler-related programs. + . + This package contains the LLVMgold and LLVMPolly linker plugins. + Package: llvm-12 Architecture: any Suggests: llvm-12-doc -Depends: llvm-12-runtime (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: llvm-12-runtime (= ${binary:Version}), + llvm-12-linker-tools (= ${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 diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index a6acd028..aab9970a 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -2,10 +2,9 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a -[!powerpc !powerpcspe] usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@*.so -usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.* +usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.so usr/lib/llvm-@LLVM_VERSION@/lib/libRemarks.* usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/ usr/include/llvm-c-@LLVM_VERSION@/ diff --git a/debian/rules b/debian/rules index b545b496..236b5856 100755 --- a/debian/rules +++ b/debian/rules @@ -330,7 +330,12 @@ preconfigure: done # Make install file executable for dh-exec - chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/libclang-common-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install debian/libomp-$(LLVM_VERSION)-dev.install + chmod +x \ + debian/clang-tools-$(LLVM_VERSION).install \ + debian/libclang-common-$(LLVM_VERSION)-dev.install \ + debian/libomp-$(LLVM_VERSION)-dev.install \ + debian/llvm-$(LLVM_VERSION)-dev.install \ + debian/llvm-$(LLVM_VERSION)-linker-tools.install # DH doesn't support the [power ...] in install on Ubuntu trusty # fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory