diff -aur ../../orig/llvm-toolchain-3.4-3.4.2/debian/changelog debian/changelog --- ../../orig/llvm-toolchain-3.4-3.4.2/debian/changelog 2014-12-10 15:23:13.000000000 +0100 +++ debian/changelog 2015-10-15 08:46:40.431009382 +0200 @@ -1,3 +1,11 @@ +llvm-toolchain-3.4 (1:3.4.2-13ubuntu3) wily; urgency=medium + + * Fixed compiler version detection for ubuntu wily. This makes + the package correctly build with gcc-5. It solves + https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-3.4/+bug/1501300 + + -- Matthias Goldhoorn Thu, 15 Oct 2015 08:43:16 +0200 + llvm-toolchain-3.4 (1:3.4.2-13ubuntu2) vivid; urgency=medium * Merge with Debian; remaining changes: diff -aur ../../orig/llvm-toolchain-3.4-3.4.2/debian/rules debian/rules --- ../../orig/llvm-toolchain-3.4-3.4.2/debian/rules 2014-12-10 15:23:07.000000000 +0100 +++ debian/rules 2015-10-15 09:13:13.339707639 +0200 @@ -4,7 +4,7 @@ DEB_INST := $(CURDIR)/debian/tmp/ # Force the version of gcc. Some archs are still using gcc 4.6 #GCC_VERSION := 4.8 -GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p') +GCC_VERSION := $(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]).*$$,\2,p') LLVM_VERSION := 3.4 LLVM_VERSION_FULL := $(LLVM_VERSION).2 SONAME_EXT := 1