[SCM] qtchooser packaging branch, master, updated. debian/63-g13a3d08-1-6-g44ced08

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtchooser.git;a=commitdiff;h=6633455

The following commit has been merged in the master branch:
commit 66334556963672c53001230b496fe5aa40449207
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 26 11:03:07 2017 +0300

    Fix FTCBFS: Pass triplet-prefixed CXX to make.
    
    Patch from Helmut Grohne.
    Closes: #836457.
---
 debian/changelog | 3 +++
 debian/rules     | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8957378..35346ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ qtchooser (64-ga1b6736-1) UNRELEASED; urgency=medium
     Make the main qtchooser package Multi-Arch: same (see bug #781226).
     Thanks to Helmut Grohne for the suggestions.
 
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Pass triplet-prefixed CXX to make (closes: #836457).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Aug 2017 16:10:17 +0300
 
 qtchooser (63-g13a3d08-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index fb69d0e..7988b5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,16 @@
 export DEB_CXXFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS)
 export LFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CXX),default)
+	CXX = $(DEB_HOST_GNU_TYPE)-g++
+endif
 
 %:
 	dh $@ 
 
 override_dh_auto_build:
-	make QTCHOOSER_GLOBAL_DIR=/usr/share:/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default
+	make QTCHOOSER_GLOBAL_DIR=/usr/share:/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default CXX=$(CXX)
 
 override_dh_auto_install:
 	make install INSTALL_ROOT=$(CURDIR)/debian/tmp

-- 
qtchooser packaging