From 6d365c027bc42513909ff4f6a457dd7ead9ead9c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 25 Sep 2018 23:48:39 +0100 Subject: [PATCH] remove the lto package, not a good idea --- debian/changelog | 1 - debian/control | 17 ++--------------- debian/libllvm-lto-X.Y-dev.install.in | 1 - debian/llvm-X.Y-dev.install.in | 1 + 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 debian/libllvm-lto-X.Y-dev.install.in diff --git a/debian/changelog b/debian/changelog index a4174cda..2d867ff5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ llvm-toolchain-7 (1:7-3) unstable; urgency=medium * Fix a syntax issue in a scan-build patch * Fix the autopkgtest script (no gcc in the test) - * Create a new llvm-lto-7-dev package to ship lto * remove dep from lld to llvm-7-dev because lld doesn't use LLVM LTO * remove old Replaces/Breaks diff --git a/debian/control b/debian/control index 2d057470..090139a4 100644 --- a/debian/control +++ b/debian/control @@ -274,8 +274,7 @@ Description: Modular compiler and toolchain technologies, IR interpreter Package: llvm-7-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends}, - llvm-7 (= ${binary:Version}), libllvm7 (= ${binary:Version}), libtinfo-dev, - libllvm-lto-7-dev + llvm-7 (= ${binary:Version}), libllvm7 (= ${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,18 +291,6 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: libllvm-lto-7-dev -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: llvm-7-dev (<< 7-3) -Replaces: llvm-7-dev (<< 7-3) -Description: Modular compiler and toolchain technologies, LTO lib - 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 provides the LTO libraries. - Package: llvm-7-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, @@ -391,7 +378,7 @@ Description: Modular compiler and toolchain technologies, examples Package: lld-7 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}, libllvm7 (= ${binary:Version}), libllvm-lto-7-dev (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm7 (= ${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 diff --git a/debian/libllvm-lto-X.Y-dev.install.in b/debian/libllvm-lto-X.Y-dev.install.in deleted file mode 100644 index 4eeb014f..00000000 --- a/debian/libllvm-lto-X.Y-dev.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.* diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index 25d65a75..f367b8e9 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -4,6 +4,7 @@ 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/libLLVM-@LLVM_VERSION_FULL@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.* usr/lib/llvm-@LLVM_VERSION@/lib/BugpointPasses.so usr/lib/llvm-@LLVM_VERSION@/lib/TestPlugin.so usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/