diff --git a/debian/changelog b/debian/changelog index 4aa430fa..f6fdfe97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,22 @@ -llvm-toolchain-snapshot (1:3.5~svn200375-1~exp1) experimental; urgency=medium +llvm-toolchain-snapshot (1:3.5~svn201239-1~exp1) experimental; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Wed, 12 Feb 2014 16:10:35 +0100 + +llvm-toolchain-snapshot (1:3.5~svn200375-1) unstable; urgency=medium * New snapshot release * polly upstream is now using the isl trunk. Disabling it for now. + * Only explicit the link against atomic when running mips & mipsel + * Fix the cindex.py declaration (3.3 => 3.5). Closes upstream bug #18365 + * Bring back the dependency on gcc 4.8. It breaks the nightly snapshot + packages and it should be the norm now... + + [ 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 Wed, 29 Jan 2014 07:36:29 -0800 @@ -44,6 +59,27 @@ llvm-toolchain-snapshot (1:3.5~svn195337-1) unstable; urgency=low -- Sylvestre Ledru Wed, 20 Nov 2013 21:24:28 +0100 +llvm-toolchain-3.4 (1:3.4-2) UNRELEASED; urgency=medium + + * Only explicit the link against atomic when running mips & mipsel + * Fix the cindex.py declaration (3.3 => 3.5). Closes upstream bug #18365 + * Bring back the dependency on gcc 4.8. It breaks the nightly snapshot + packages and it should be the norm now... + + [ 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 + + * New upstream release + * Remove explicit dep on gcc 4.8 + + -- Sylvestre Ledru Fri, 20 Dec 2013 18:36:58 +0100 + llvm-toolchain-3.4 (1:3.4~+rc3-1) unstable; urgency=low * New testing upstream release diff --git a/debian/llvm-3.5-dev.dirs b/debian/llvm-3.5-dev.dirs index 983d712c..9b3a0ae9 100644 --- a/debian/llvm-3.5-dev.dirs +++ b/debian/llvm-3.5-dev.dirs @@ -1,5 +1,7 @@ /usr/lib/llvm-3.5/lib /usr/lib/llvm-3.5/build /usr/lib/llvm-3.5/include +/usr/lib/llvm-3.5/build/unittests +/usr/lib/llvm-3.5/build/utils/lit/ usr/share/doc/llvm-3.5-dev usr/share/emacs/site-lisp/llvm-3.5 diff --git a/debian/llvm-3.5-dev.install b/debian/llvm-3.5-dev.install index 5c03da02..bb732132 100644 --- a/debian/llvm-3.5-dev.install +++ b/debian/llvm-3.5-dev.install @@ -1,3 +1,5 @@ +usr/lib/llvm-3.5/bin/not* +usr/lib/llvm-3.5/bin/FileCheck* usr/lib/llvm-3.5/lib/libLLVM*.a usr/lib/llvm-3.5/lib/libllvm*.a usr/lib/llvm-3.5/lib/LLVM*.so @@ -12,6 +14,7 @@ build-llvm/config.status /usr/lib/llvm-3.5/build/ Makefile.rules /usr/lib/llvm-3.5/build/ configure /usr/lib/llvm-3.5/build/ autoconf/ /usr/lib/llvm-3.5/build/ +unittests/Makefile.unittest /usr/lib/llvm-3.5/build/unittests utils/vim/llvm-3.5.vim usr/share/vim/addons/syntax/ utils/vim/tablegen-3.5.vim usr/share/vim/addons/syntax/ @@ -19,3 +22,6 @@ utils/vim/tablegen-3.5.vim usr/share/vim/addons/syntax/ utils/emacs/emacs.el usr/share/emacs/site-lisp/llvm-3.5/ utils/emacs/llvm-mode.el usr/share/emacs/site-lisp/llvm-3.5/ utils/emacs/tablegen-mode.el usr/share/emacs/site-lisp/llvm-3.5/ + +utils/lit/* usr/lib/llvm-3.5/build/utils/lit/ + diff --git a/debian/llvm-3.5-dev.links.in b/debian/llvm-3.5-dev.links.in index 13c57332..5ae81fe0 100644 --- a/debian/llvm-3.5-dev.links.in +++ b/debian/llvm-3.5-dev.links.in @@ -2,3 +2,7 @@ usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libL usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1 usr/lib/llvm-3.5/lib/libLLVM-3.5.so usr/include/llvm-c-3.5/llvm-c usr/lib/llvm-3.5/include/llvm-c usr/include/llvm-3.5/llvm usr/lib/llvm-3.5/include/llvm +usr/include/llvm-c-3.5/llvm-c usr/lib/llvm-3.5/build/include/llvm-c +usr/include/llvm-3.5/llvm usr/lib/llvm-3.5/build/include/llvm +usr/lib/llvm-3.5/include/ usr/lib/llvm-3.5/build/include + 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..49a21a99 --- /dev/null +++ b/debian/patches/fix-llvm-config-obj-src-root.patch @@ -0,0 +1,16 @@ +Index: llvm-toolchain-snapshot_3.5~svn201239/tools/llvm-config/llvm-config.cpp +=================================================================== +--- llvm-toolchain-snapshot_3.5~svn201239.orig/tools/llvm-config/llvm-config.cpp 2014-02-12 16:21:54.713558937 +0100 ++++ llvm-toolchain-snapshot_3.5~svn201239/tools/llvm-config/llvm-config.cpp 2014-02-12 16:34:24.993540587 +0100 +@@ -321,9 +321,9 @@ + OS << "ON\n"; + #endif + } else if (Arg == "--obj-root") { +- OS << ActivePrefix << '\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/lldb-link-atomic.diff b/debian/patches/lldb-link-atomic.diff index a8b71d01..aae852f5 100644 --- a/debian/patches/lldb-link-atomic.diff +++ b/debian/patches/lldb-link-atomic.diff @@ -12,6 +12,7 @@ Index: llvm-toolchain-snapshot_3.5~svn200375/lldb/lib/Makefile # Link in python LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel + ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel)) ++ ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), mips mipsel powerpc powerpcspe)) + # Link GCC atomic helper library + LLVMLibsOptions += -latomic + endif diff --git a/debian/patches/series b/debian/patches/series index f1f14352..cd7f4874 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,3 +34,4 @@ do-not-fail-on-unexpected-pass.diff silent-more-tests.diff disable-display-PASS-UNSUPPORTED-XFAIL.diff lldb-link-atomic.diff +fix-llvm-config-obj-src-root.patch