Package: src:llvm-toolchain-snapshot Version: 1:5.0~svn305653-1 Severity: serious Tags: patch sid User: debian-...@lists.debian.org Usertags: ftbfs-gcc-7
Dear LLVM packagers, I've noticed that llvm-toolchain-snapshot goes FTBFS because `debian/rules' in the packge fails to detect gcc-7 (it tries to use gcc-7.1). The Jenkins builds seem to be failing due to the same bug. http://llvm-jenkins.debian.net/view/Debian%20unstable/job/llvm-toolchain-binaries/architecture=amd64,distribution=unstable/898/console Here I send a patch to fix this by ensuring the existence of /usr/bin/g++-$(GCC_VERSION) on the build system. Could you take a look at it please?
diff -Nru llvm-toolchain-snapshot-5.0~svn305653/debian/changelog llvm-toolchain-snapshot-5.0~svn305653/debian/changelog
--- llvm-toolchain-snapshot-5.0~svn305653/debian/changelog 2017-06-09 19:04:56.000000000 +0900
+++ llvm-toolchain-snapshot-5.0~svn305653/debian/changelog 2017-08-09 23:32:40.000000000 +0900
@@ -1,3 +1,10 @@
+llvm-toolchain-snapshot (1:5.0~svn305653-1.1) UNRELEASED; urgency=medium
+
+ * Ensure /usr/bin/g++-$(GCC_VERSION) exists
+
+ -- Katsuhiko Nishimra <ktns...@gmail.com> Wed, 09 Aug 2017 23:32:40 +0900
+
llvm-toolchain-snapshot (1:5.0~svn305653-1) unstable; urgency=medium
[ Gianfranco Costamagna ]
diff -Nru llvm-toolchain-snapshot-5.0~svn305653/debian/rules llvm-toolchain-snapshot-5.0~svn305653/debian/rules
--- llvm-toolchain-snapshot-5.0~svn305653/debian/rules 2017-06-09 19:04:56.000000000 +0900
+++ llvm-toolchain-snapshot-5.0~svn305653/debian/rules 2017-08-09 23:32:40.000000000 +0900
@@ -2,9 +2,11 @@
TARGET_BUILD := build-llvm
DEB_INST := $(CURDIR)/debian/tmp/
-# The 5|6| 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|6|[0-9]+\.[0-9]+|[0-9]+).*$$,\2,p')
+
+GXX_VERSIONED_PACKAGE := $(shell dpkg-query -W -f '$${Depends}' g++ | grep -o 'g++-[0-9][0-9.]*' | tail -n1 )
+GXX_VERSIONED_EXECUTABLE := $(shell dpkg -L $(GXX_VERSIONED_PACKAGE) | grep '/usr/bin/g++-[0-9][0-9.]*' | xargs ls -d | tail -n1 )
+GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE))
+
LLVM_VERSION := 5.0
LLVM_VERSION_FULL := $(LLVM_VERSION).0
signature.asc
Description: PGP signature
