From: Tobias Frost <tobi@coldtobi.de>
Date: Sat, 21 Nov 2015 15:51:58 +0000 (+0100)
Subject: Import patch from Helmut, #794035
X-Git-Tag: debian/6.5+svn4324-1~30
X-Git-Url: https://git.proxmox.com/?p=mirror_smartmontools-debian.git;a=commitdiff_plain;h=20a5687ae733382dba1408272fbbc89c50e0084b

Import patch from Helmut, #794035
---

diff --git a/debian/changelog b/debian/changelog
index 81db3b3..0695200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+smartmontools (6.4+svn4109-2) UNRELEASED; urgency=medium
+
+  [ Helmut Grohne ]
+  * Non-maintainer upload.
+  * Fix FTCBFS. (Closes: #794035)
+    + Pass --build and --host to configure
+
+  [ Tobias Frost ]
+  * Import patch from Helmut (see above)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Thu, 30 Jul 2015 01:18:49 +0200
+
 smartmontools (6.4+svn4109-1) unstable; urgency=medium
 
   * New upstream version. Closes: #789721.
diff --git a/debian/rules b/debian/rules
index aebaaea..2aae688 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-DEB_BUILD_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	CONFIGURE_ARGS += --with-selinux
@@ -53,6 +53,8 @@ configure-stamp:
 	dh_testdir
 	./autogen.sh
 	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" ./configure --prefix=/usr		 \
+				--build=$(DEB_BUILD_GNU_TYPE) \
+				--host=$(DEB_HOST_GNU_TYPE) \
 				--sysconfdir=/etc		 \
 				--mandir=/usr/share/man		 \
 				--with-initscriptdir=no \