From 0ba0844df3a8ec1c90f362e5881165d4d46d64e4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Jan 2016 12:45:01 +0000 Subject: [PATCH] - Create symlinks with ".links", don't install from build tree - Remove LLVM-internal tools (lit, FileCheck, not, tblgen, etc.) - Remove llvm-X.Y-tools package, because it contained only internal tools that are not intended for distribution. - Remove autotools-specific artifacts from packages. - Remove "dummy" documentation artifacts from llvm-X.Y-docs package. Not built/installed by CMake, not useful. --- debian/changelog | 7 +++++++ debian/clang-X.Y.install.in | 7 ------- debian/clang-X.Y.lintian-overrides.in | 2 -- debian/clang-X.Y.manpages.in | 2 -- debian/control | 20 -------------------- debian/libclang-X.Y-dev.install.in | 1 - debian/libclang-X.Y-dev.links.in | 1 + debian/libclang1-X.Y.install.in | 1 - debian/libclang1-X.Y.links.in | 1 + debian/liblldb-X.Y.install.in | 1 - debian/liblldb-X.Y.links.in | 3 +-- debian/libllvmX.Y.links.in | 1 + debian/llvm-X.Y-dev.install.in | 6 ------ debian/llvm-X.Y-doc.install.in | 6 +++--- debian/llvm-X.Y-runtime.install.in | 2 -- debian/llvm-X.Y.lintian-overrides.in | 1 - debian/llvm-X.Y.manpages.in | 1 - 17 files changed, 14 insertions(+), 49 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce50fc96..5b086226 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,13 @@ llvm-toolchain-snapshot (1:3.8~svn256489-1~exp1) experimental; urgency=medium * New snapshot release * Cmake migration. Done by Andrew Wilkins. Many thanks to him - Update patches to set SONAME in CMake build + - Create symlinks with ".links", don't install from build tree + - Remove LLVM-internal tools (lit, FileCheck, not, tblgen, etc.) + - Remove llvm-X.Y-tools package, because it contained only + internal tools that are not intended for distribution. + - Remove autotools-specific artifacts from packages. + - Remove "dummy" documentation artifacts from llvm-X.Y-docs + package. Not built/installed by CMake, not useful. -- Sylvestre Ledru Mon, 28 Dec 2015 09:31:25 +0100 diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 510a9def..81055b24 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -1,15 +1,11 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang usr/lib/llvm-@LLVM_VERSION@/bin/clang++ usr/lib/llvm-@LLVM_VERSION@/bin/clang-check -usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen -usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements -usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-query usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename usr/lib/llvm-@LLVM_VERSION@/bin/sancov -usr/bin/c-index-test* tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ @@ -17,10 +13,7 @@ tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@LLVM_VERSION@ usr/bin/clang-check-@LLVM_VERSION@ -usr/bin/clang-tblgen-@LLVM_VERSION@ -usr/bin/c-index-test-@LLVM_VERSION@ usr/bin/clang-apply-replacements-@LLVM_VERSION@ -usr/bin/pp-trace-@LLVM_VERSION@ usr/bin/clang-query-@LLVM_VERSION@ usr/bin/clang-rename-@LLVM_VERSION@ usr/bin/sancov-@LLVM_VERSION@ diff --git a/debian/clang-X.Y.lintian-overrides.in b/debian/clang-X.Y.lintian-overrides.in index 46514394..f51804d3 100644 --- a/debian/clang-X.Y.lintian-overrides.in +++ b/debian/clang-X.Y.lintian-overrides.in @@ -1,10 +1,8 @@ # I know but well... clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-apply-replacements-@LLVM_VERSION@.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-check-@LLVM_VERSION@.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/clang-tblgen-@LLVM_VERSION@.1.gz -clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/pp-trace-@LLVM_VERSION@.1.gz clang-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/scan-view-@LLVM_VERSION@.1.gz diff --git a/debian/clang-X.Y.manpages.in b/debian/clang-X.Y.manpages.in index eefde3c3..2801e790 100644 --- a/debian/clang-X.Y.manpages.in +++ b/debian/clang-X.Y.manpages.in @@ -1,7 +1,5 @@ #build-llvm/tools/clang/docs/tools/clang-@LLVM_VERSION@.1 clang/tools/scan-build/man/scan-build-@LLVM_VERSION@.1 debian/man/clang-check-@LLVM_VERSION@.1 -debian/man/clang-tblgen-@LLVM_VERSION@.1 debian/man/scan-view-@LLVM_VERSION@.1 debian/man/clang-apply-replacements-@LLVM_VERSION@.1 -debian/man/pp-trace-@LLVM_VERSION@.1 diff --git a/debian/control b/debian/control index b7c742b8..56508ded 100644 --- a/debian/control +++ b/debian/control @@ -281,26 +281,6 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: llvm-3.8-tools -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python, - llvm-3.8-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 - compiler-related programs. - . - LLVM uses a single, language-independent virtual instruction set both - as an offline code representation (to communicate code between - compiler phases and to run-time systems) and as the compiler internal - representation (to analyze and transform programs). This persistent - code representation allows a common set of sophisticated compiler - techniques to be applied at compile-time, link-time, install-time, - run-time, or "idle-time" (between program runs). - . - This package provides tools for testing. - - Package: libllvm-3.8-ocaml-dev Section: ocaml Architecture: any diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index cb9a6deb..2b4548fc 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -1,7 +1,6 @@ usr/lib/llvm-@LLVM_VERSION@/include/clang usr/lib/llvm-@LLVM_VERSION@/include/clang-c usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so build-llvm/tools/clang/runtime/compiler-rt/clang_linux/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/lib/ diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in index 5edcb499..6f99d5bf 100644 --- a/debian/libclang-X.Y-dev.links.in +++ b/debian/libclang-X.Y-dev.links.in @@ -1,2 +1,3 @@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Y.install.in index 27c6af7b..48a548a5 100644 --- a/debian/libclang1-X.Y.install.in +++ b/debian/libclang1-X.Y.install.in @@ -1,3 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in index 1eee7d44..3ea44c8d 100644 --- a/debian/libclang1-X.Y.links.in +++ b/debian/libclang1-X.Y.links.in @@ -1,2 +1,3 @@ # as upstream usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Y.install.in index e1818b34..8545597e 100644 --- a/debian/liblldb-X.Y.install.in +++ b/debian/liblldb-X.Y.install.in @@ -1,3 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/readline.so diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Y.links.in index a046fc49..bea86baa 100644 --- a/debian/liblldb-X.Y.links.in +++ b/debian/liblldb-X.Y.links.in @@ -1,5 +1,4 @@ -usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so -usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so usr/lib/python2.7/dist-packages/lldb-@LLVM_VERSION@/_lldb.so usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Y.links.in index 4faec3f9..067b0884 100644 --- a/debian/libllvmX.Y.links.in +++ b/debian/libllvmX.Y.links.in @@ -1,3 +1,4 @@ # Should be uncommented for @LLVM_VERSION@.1 and other # usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION@.so diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index 59f2b649..813b6f2f 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -8,12 +8,6 @@ usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/ usr/include/llvm-c-@LLVM_VERSION@/ # Explicit debian/tmp since there are multiple declarations debian/tmp/usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ -build-llvm/Makefile.common /usr/lib/llvm-@LLVM_VERSION@/build/ -build-llvm/Makefile.config /usr/lib/llvm-@LLVM_VERSION@/build/ -build-llvm/config.status /usr/lib/llvm-@LLVM_VERSION@/build/ -Makefile.rules /usr/lib/llvm-@LLVM_VERSION@/build/ -configure /usr/lib/llvm-@LLVM_VERSION@/build/ -autoconf/ /usr/lib/llvm-@LLVM_VERSION@/build/ utils/vim/indent/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/indent/ diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in index 60ae20bd..6ac115a5 100644 --- a/debian/llvm-X.Y-doc.install.in +++ b/debian/llvm-X.Y-doc.install.in @@ -1,6 +1,6 @@ docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/ -usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz +#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz #usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz -usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html +#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html #usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css -usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html +#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html diff --git a/debian/llvm-X.Y-runtime.install.in b/debian/llvm-X.Y-runtime.install.in index d8e16a7c..2fe0d36a 100644 --- a/debian/llvm-X.Y-runtime.install.in +++ b/debian/llvm-X.Y-runtime.install.in @@ -1,8 +1,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/lli -usr/lib/llvm-@LLVM_VERSION@/bin/lli-child-target usr/bin/lli-@LLVM_VERSION@ -usr/bin/lli-child-target-@LLVM_VERSION@ debian/llvm-@LLVM_VERSION@-runtime.binfmt usr/share/binfmts/ diff --git a/debian/llvm-X.Y.lintian-overrides.in b/debian/llvm-X.Y.lintian-overrides.in index d59be5db..89080d30 100644 --- a/debian/llvm-X.Y.lintian-overrides.in +++ b/debian/llvm-X.Y.lintian-overrides.in @@ -5,5 +5,4 @@ llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-mc llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-objdump-@LLVM_VERSION@.1.gz llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-rtdyld-@LLVM_VERSION@.1.gz llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-size-@LLVM_VERSION@.1.gz -llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-tblgen-@LLVM_VERSION@.1.gz llvm-@LLVM_VERSION@: manpage-has-useless-whatis-entry usr/share/man/man1/llvm-ranlib-@LLVM_VERSION@.1.gz diff --git a/debian/llvm-X.Y.manpages.in b/debian/llvm-X.Y.manpages.in index 8923996c..0599d728 100644 --- a/debian/llvm-X.Y.manpages.in +++ b/debian/llvm-X.Y.manpages.in @@ -5,6 +5,5 @@ debian/man/llvm-mcmarkup-@LLVM_VERSION@.1 debian/man/llvm-objdump-@LLVM_VERSION@.1 debian/man/llvm-rtdyld-@LLVM_VERSION@.1 debian/man/llvm-size-@LLVM_VERSION@.1 -debian/man/llvm-tblgen-@LLVM_VERSION@.1 debian/man/llvm-ranlib-@LLVM_VERSION@.1