From 7543629b39b7886c143f6c6f04cd9773c3894b79 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Dec 2013 11:53:29 +0000 Subject: [PATCH] * r600 is now compiled by default (remove the configure arg) * Also add usr/lib/llvm-3.4/lib/clang/3.4/include => usr/lib/clang/3.4/include symlink to simplify the path detection --- debian/changelog | 9 +++------ debian/libclang-common-3.4-dev.links | 3 ++- debian/patches/series | 1 + debian/rules | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index c87a0acb..063dd58a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,8 @@ -llvm-toolchain-3.4 (1:3.4~+rc2-2) UNRELEASED; urgency=low - - * r600 is now compiled by default - - -- Sylvestre Ledru Tue, 03 Dec 2013 12:01:17 +0100 - llvm-toolchain-3.4 (1:3.4~+rc2-1) unstable; urgency=low * New testing upstream release * 0047-version-name.diff ocamldoc.diff removed (applied upstream) + * r600 is now compiled by default (remove the configure arg) -- Sylvestre Ledru Tue, 03 Dec 2013 10:25:59 +0100 @@ -34,6 +29,8 @@ llvm-toolchain-3.4 (1:3.4~+rc1-3) unstable; urgency=low * If we get an unexpected pass, do not break the tests do-not-fail-on-unexpected-pass.diff (I am disabling some tests) * Fix the path detection of the objective h headers. + * Also add usr/lib/llvm-3.4/lib/clang/3.4/include => + usr/lib/clang/3.4/include symlink to simplify the path detection -- Sylvestre Ledru Sun, 01 Dec 2013 17:49:46 +0100 diff --git a/debian/libclang-common-3.4-dev.links b/debian/libclang-common-3.4-dev.links index 9afa9e0f..1710f707 100644 --- a/debian/libclang-common-3.4-dev.links +++ b/debian/libclang-common-3.4-dev.links @@ -1,2 +1,3 @@ usr/lib/llvm-3.4/lib/clang/3.4/include usr/include/clang/3.4/include -usr/lib/llvm-3.4/lib/clang/3.4/lib /usr/lib/clang/3.4/lib +usr/lib/llvm-3.4/lib/clang/3.4/include usr/lib/clang/3.4/include +usr/lib/llvm-3.4/lib/clang/3.4/lib usr/lib/clang/3.4/lib diff --git a/debian/patches/series b/debian/patches/series index f996ca13..d3485c7a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -31,3 +31,4 @@ include-target.diff debian-mips64-n32-multiarch.diff force-gcc-header-obj.diff +do-not-fail-on-unexpected-pass.diff diff --git a/debian/rules b/debian/rules index feccf65a..e004405c 100755 --- a/debian/rules +++ b/debian/rules @@ -312,7 +312,7 @@ override_dh_installdeb: rm -f $(CURDIR)/debian/lldb-$(LLVM_VERSION)/usr/lib/python*/dist-packages/lldb/__init__.pyc rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make* - rm $(CURDIR)//debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT + rm -f $(CURDIR)//debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT