Import patch from Helmut, #794035

diff --git a/debian/changelog b/debian/changelog
index ca67726a2738310bcaa02bf3f4c2503f9791bd90..470c34dbdb5ee6c0987cc48e0bb399fbd092060e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+smartmontools (6.3+svn4002-2.1) 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.3+svn4002-2) unstable; urgency=low
 
   * [12d5f9d] Correct maintscript syntax (Closes: #766178)

diff --git a/debian/rules b/debian/rules
index 184d645e2f667b00e3b9e6e21cc891491feef5c5..41a1ea24ae5c77db7fed07f8cd7504f73ceee73a 100755 (executable)
--- 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
@@ -52,6 +52,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 \