From 0b361a554f367f2058b9c8b70d5c8a62fa448ad3 Mon Sep 17 00:00:00 2001 From: Tobias Frost Date: Sat, 21 Nov 2015 16:51:58 +0100 Subject: [PATCH] Import patch from Helmut, #794035 --- debian/changelog | 12 ++++++++++++ debian/rules | 6 ++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca67726..470c34d 100644 --- 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 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 184d645..41a1ea2 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 @@ -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 \ -- 2.39.2