From 1f3894fc86933a01f10b7b555486ad79f3fc8f0c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 4 Aug 2015 16:33:23 +0000 Subject: [PATCH] * Workaround: The 5| in the debian/rules regexp is a crappy workaround. g++ 5.2 in Debian is not providing a g++-5.2 binary (only g++-5) accomodate that by hardcoding the 5 detection * Remove Dummy.html from clang-3.7-doc to avoid install (Closes: #794539) --- debian/changelog | 10 ++++++++++ debian/clang-X.Y-doc.install.in | 1 - debian/rules | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 debian/clang-X.Y-doc.install.in diff --git a/debian/changelog b/debian/changelog index 2a9d87ec..e7fa5c03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +llvm-toolchain-3.7 (1:3.7~+rc2-2) unstable; urgency=medium + + * Workaround: + The 5| in the debian/rules regexp is a crappy workaround. + g++ 5.2 in Debian is not providing a g++-5.2 binary (only + g++-5) accomodate that by hardcoding the 5 detection + * Remove Dummy.html from clang-3.7-doc to avoid install (Closes: #794539) + + -- Sylvestre Ledru Tue, 04 Aug 2015 09:27:22 +0200 + llvm-toolchain-3.7 (1:3.7~+rc2-1) unstable; urgency=medium * New snapshot release diff --git a/debian/clang-X.Y-doc.install.in b/debian/clang-X.Y-doc.install.in deleted file mode 100644 index 54efd13e..00000000 --- a/debian/clang-X.Y-doc.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/ diff --git a/debian/rules b/debian/rules index 6d270935..c1403cc1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,9 @@ TARGET_BUILD := build-llvm DEB_INST := $(CURDIR)/debian/tmp/ #GCC_VERSION := 4.8 -GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') +# The 5| in the regexp is a crappy workaround. g++ 5.2 in Debian is not providing a g++-5.2 binary (only g++-5) +# accomodate that by hardcoding the 5 detection +GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?(5|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p') LLVM_VERSION := 3.7 LLVM_VERSION_FULL := $(LLVM_VERSION).0 SONAME_EXT := 1