[Dctrl-tools-devel] [dctrl-tools] 01/01: Pass CC=$(DEB_HOST_GNU_TYPE)-gcc when cross-building (closes: #734887)

[Gerfried Fuchs]

This is an automated email from the git hooks/post-receive script.

rhonda pushed a commit to branch debian
in repository dctrl-tools.

commit fc6996b20181c63d0a3165b6384839825fb21f18
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Thu Mar 19 22:44:08 2015 +0100

    Pass CC=$(DEB_HOST_GNU_TYPE)-gcc when cross-building (closes: #734887)
---
 debian/changelog |  4 ++++
 debian/rules     | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 913b507..625dae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 dctrl-tools (2.24-1) UNRELEASED; urgency=low
 
+  [ Rhonda D'Vine ]
   * New upstream release, which addresses:
     - Fixed join-dctrl without -o (closes: #679442)
     - Fixed grep-dctrl -I (closes: #775351)
@@ -8,6 +9,9 @@ dctrl-tools (2.24-1) UNRELEASED; urgency=low
     the time being.
   * Switch source format to 3.0 (quilt) given that upstream is seperated now.
 
+  [ Colin Watson ]
+  * Pass CC=$(DEB_HOST_GNU_TYPE)-gcc when cross-building (closes: #734887)
+
  -- Rhonda D'Vine <rhonda at debian.org>  Sun, 22 Feb 2015 17:36:46 +0100
 
 dctrl-tools (2.23) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 7d460e1..8b69e8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,15 @@
 %:
 	dh $@
 
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	cross :=
+else
+	cross := CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
 override_dh_auto_build:
-	dh_auto_build -- prefix=/usr sysconfdir=/etc
+	dh_auto_build -- prefix=/usr sysconfdir=/etc $(cross)
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr sysconfdir=/etc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/dctrl-tools.git