From 7f14b364a663b3533400b4ee6d5065edab74402f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 21 Jul 2016 07:15:49 +0000 Subject: [PATCH] * Bring back llvm-3.9-tools to life * ship clang-tblgen & yaml-bench as part of the libclang-common-X.Y-dev package --- debian/changelog | 7 +++++-- debian/control | 20 ++++++++++++++++++++ debian/libclang-common-X.Y-dev.install.in | 7 +++++++ debian/llvm-X.Y-tools.dirs.in | 2 ++ debian/llvm-X.Y-tools.install.in | 9 +++++++++ debian/rules | 5 +---- llvm-X.Y-tools.install.in | 9 +++++++++ 7 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 debian/llvm-X.Y-tools.dirs.in create mode 100644 debian/llvm-X.Y-tools.install.in create mode 100644 llvm-X.Y-tools.install.in diff --git a/debian/changelog b/debian/changelog index 9a553595..725e0172 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -llvm-toolchain-3.9 (1:3.9~svn275597-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-3.9 (1:3.9~svn275918-1~exp1) UNRELEASED; urgency=medium * New snapshot release * Silent test CodeGen/SPARC/LeonInsertNOPsDoublePrecision.ll + * Bring back llvm-3.9-tools to life + * ship clang-tblgen & yaml-bench as part of the libclang-common-X.Y-dev + package - -- Sylvestre Ledru Fri, 15 Jul 2016 21:29:38 +0200 + -- Sylvestre Ledru Tue, 19 Jul 2016 15:34:08 +0200 llvm-toolchain-snapshot (1:3.9~svn274438-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 88ff47a7..f1fbc684 100644 --- a/debian/control +++ b/debian/control @@ -288,6 +288,26 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. +Package: llvm-3.9-tools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python, + llvm-3.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 + 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.9-ocaml-dev Section: ocaml Architecture: any diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index ba08e70c..3d9d13ef 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -5,3 +5,10 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/*.txt #usr/lib/clang/@LLVM_VERSION_FULL@/lib /usr/lib/clang/@LLVM_VERSION@/ #usr/lib/clang/@LLVM_VERSION_FULL@/include/ /usr/include/clang/@LLVM_VERSION@/ + +usr/lib/llvm-@LLVM_VERSION@/bin/clang-tblgen +usr/lib/llvm-@LLVM_VERSION@/bin/yaml-bench + +usr/bin/clang-tblgen-@LLVM_VERSION@ +usr/bin/yaml-bench-@LLVM_VERSION@ + diff --git a/debian/llvm-X.Y-tools.dirs.in b/debian/llvm-X.Y-tools.dirs.in new file mode 100644 index 00000000..401df068 --- /dev/null +++ b/debian/llvm-X.Y-tools.dirs.in @@ -0,0 +1,2 @@ +/usr/lib/llvm-@LLVM_VERSION@/build/unittests +/usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ diff --git a/debian/llvm-X.Y-tools.install.in b/debian/llvm-X.Y-tools.install.in new file mode 100644 index 00000000..db5574f7 --- /dev/null +++ b/debian/llvm-X.Y-tools.install.in @@ -0,0 +1,9 @@ +usr/lib/llvm-@LLVM_VERSION@/bin/count +usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck +usr/lib/llvm-@LLVM_VERSION@/bin/not + +utils/lit/* /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ + +usr/bin/count-@LLVM_VERSION@ +usr/bin/FileCheck-@LLVM_VERSION@ +usr/bin/not-@LLVM_VERSION@ diff --git a/debian/rules b/debian/rules index a5d3a939..859c926a 100755 --- a/debian/rules +++ b/debian/rules @@ -214,6 +214,7 @@ override_dh_auto_configure: preconfigure -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_FLAGS='$(CXXFLAGS_EXTRA)' \ -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_INSTALL_UTILS=ON \ -DLLVM_VERSION_SUFFIX= \ -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ @@ -306,10 +307,6 @@ override_dh_auto_install: mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang -# internal tools, don't care - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/count - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/not - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/FileCheck # Don't think it is used rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly*a # Probably useless diff --git a/llvm-X.Y-tools.install.in b/llvm-X.Y-tools.install.in new file mode 100644 index 00000000..db5574f7 --- /dev/null +++ b/llvm-X.Y-tools.install.in @@ -0,0 +1,9 @@ +usr/lib/llvm-@LLVM_VERSION@/bin/count +usr/lib/llvm-@LLVM_VERSION@/bin/FileCheck +usr/lib/llvm-@LLVM_VERSION@/bin/not + +utils/lit/* /usr/lib/llvm-@LLVM_VERSION@/build/utils/lit/ + +usr/bin/count-@LLVM_VERSION@ +usr/bin/FileCheck-@LLVM_VERSION@ +usr/bin/not-@LLVM_VERSION@