diff --git a/debian/changelog b/debian/changelog index 83f6ed97..2ae9a801 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,12 @@ llvm-toolchain-3.4 (1:3.4-2) UNRELEASED; urgency=medium * Bring back the dependency on gcc 4.8. It breaks the nightly snapshot packages and it should be the norm now... - -- Sylvestre Ledru Wed, 15 Jan 2014 11:19:21 +0100 + [ Martin Nowack ] + * Fixed build directory for llvm-config + * Add Unittests for running tests for llvm-based projects + * Install FileCheck and not for testing + + -- Sylvestre Ledru Tue, 11 Feb 2014 11:19:21 +0100 llvm-toolchain-3.4 (1:3.4-1) unstable; urgency=medium diff --git a/debian/llvm-3.4-dev.dirs b/debian/llvm-3.4-dev.dirs index 5dac3aa4..45054f3c 100644 --- a/debian/llvm-3.4-dev.dirs +++ b/debian/llvm-3.4-dev.dirs @@ -1,5 +1,7 @@ /usr/lib/llvm-3.4/lib /usr/lib/llvm-3.4/build /usr/lib/llvm-3.4/include +/usr/lib/llvm-3.4/build/unittests +/usr/lib/llvm-3.4/build/utils/lit/ usr/share/doc/llvm-3.4-dev usr/share/emacs/site-lisp/llvm-3.4 diff --git a/debian/llvm-3.4-dev.install b/debian/llvm-3.4-dev.install index 447ed1d3..d943b774 100644 --- a/debian/llvm-3.4-dev.install +++ b/debian/llvm-3.4-dev.install @@ -1,3 +1,5 @@ +usr/lib/llvm-3.4/bin/not* +usr/lib/llvm-3.4/bin/FileCheck* usr/lib/llvm-3.4/lib/libLLVM*.a usr/lib/llvm-3.4/lib/libllvm*.a usr/lib/llvm-3.4/lib/LLVM*.so @@ -12,10 +14,13 @@ build-llvm/config.status /usr/lib/llvm-3.4/build/ Makefile.rules /usr/lib/llvm-3.4/build/ configure /usr/lib/llvm-3.4/build/ autoconf/ /usr/lib/llvm-3.4/build/ +unittests/Makefile.unittest /usr/lib/llvm-3.4/build/unittests/ utils/vim/llvm-3.4.vim usr/share/vim/addons/syntax/ utils/vim/tablegen-3.4.vim usr/share/vim/addons/syntax/ +utils/lit/* /usr/lib/llvm-3.4/build/utils/lit/ + utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.4/ utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.4/ utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.4/ diff --git a/debian/llvm-3.4-dev.links.in b/debian/llvm-3.4-dev.links.in index 518412b3..fb27cb6a 100644 --- a/debian/llvm-3.4-dev.links.in +++ b/debian/llvm-3.4-dev.links.in @@ -2,3 +2,38 @@ usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libL usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.4.so.1 usr/lib/llvm-3.4/lib/libLLVM-3.4.so usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/include/llvm-c usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/include/llvm +usr/include/llvm-c-3.4/llvm-c usr/lib/llvm-3.4/build/include/llvm-c +usr/include/llvm-3.4/llvm usr/lib/llvm-3.4/build/include/llvm +usr/lib/llvm-3.4/include/ usr/lib/llvm-3.4/build/include +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Coverage +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Profile+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Release+Debug+Profile+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Unoptimized+Profile+Coverage+Asserts +usr/lib/llvm-3.4/ usr/lib/llvm-3.4/build/Debug+Profile+Coverage+Asserts diff --git a/debian/patches/0007-install-dejagnu-files.patch b/debian/patches/0007-install-dejagnu-files.patch new file mode 100644 index 00000000..416c7c21 --- /dev/null +++ b/debian/patches/0007-install-dejagnu-files.patch @@ -0,0 +1,49 @@ +From: LLVM Packaging Team +Date: Fri, 5 Apr 2013 17:32:20 +0200 +Subject: install-dejagnu-files.patch + +--- + utils/FileCheck/Makefile | 2 +- + utils/count/Makefile | 2 +- + utils/not/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile +index 268b7bc..e7674f9 100644 +--- a/utils/FileCheck/Makefile ++++ b/utils/FileCheck/Makefile +@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a + TOOL_NO_EXPORTS = 1 + + # Don't install this utility +-NO_INSTALL = 1 ++#NO_INSTALL = 1 + + include $(LEVEL)/Makefile.common + +diff --git a/utils/count/Makefile b/utils/count/Makefile +index 8de076a..41447d5 100644 +--- a/utils/count/Makefile ++++ b/utils/count/Makefile +@@ -15,6 +15,6 @@ USEDLIBS = + TOOL_NO_EXPORTS = 1 + + # Don't install this utility +-NO_INSTALL = 1 ++# NO_INSTALL = 1 + + include $(LEVEL)/Makefile.common +diff --git a/utils/not/Makefile b/utils/not/Makefile +index f37f166..48e9286 100644 +--- a/utils/not/Makefile ++++ b/utils/not/Makefile +@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a + TOOL_NO_EXPORTS = 1 + + # Don't install this utility +-NO_INSTALL = 1 ++# NO_INSTALL = 1 + + include $(LEVEL)/Makefile.common + +-- diff --git a/debian/patches/fix-llvm-config-obj-src-root.patch b/debian/patches/fix-llvm-config-obj-src-root.patch new file mode 100644 index 00000000..083f8006 --- /dev/null +++ b/debian/patches/fix-llvm-config-obj-src-root.patch @@ -0,0 +1,16 @@ +Index: llvm-toolchain-3.3/tools/llvm-config/llvm-config.cpp +=================================================================== +--- llvm-toolchain-3.3.orig/tools/llvm-config/llvm-config.cpp 2013-11-26 10:49:16.183929247 +0100 ++++ llvm-toolchain-3.3/tools/llvm-config/llvm-config.cpp 2013-11-26 10:49:16.179929247 +0100 +@@ -302,9 +302,9 @@ + } else if (Arg == "--build-mode") { + OS << LLVM_BUILDMODE << '\n'; + } else if (Arg == "--obj-root") { +- OS << LLVM_OBJ_ROOT << '\n'; ++ OS << ActivePrefix << "/build/" << '\n'; + } else if (Arg == "--src-root") { +- OS << LLVM_SRC_ROOT << '\n'; ++ OS << ActivePrefix << "/build/" << '\n'; + } else { + usage(); + } diff --git a/debian/patches/series b/debian/patches/series index 644b5bd5..f5a89149 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,3 +34,5 @@ force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff fix-an-issue-in-chroot-witout-proc.diff lldb-link-atomic.diff +0007-install-dejagnu-files.patch +fix-llvm-config-obj-src-root.patch