[Debian-mobcom-maintainers] Bug#985796: freediameter FTCBFS: hard codes the build architecture strip

[Helmut Grohne]

Source: freediameter
Version: 1.2.1-8
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

freediameter fails to cross build from source, because debian/rules hard
codes the build architecture strip. The easiest way of fixing that is
using the STRIP variable seeded from dpkg's buildtools.mk. Please
consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru freediameter-1.2.1/debian/changelog freediameter-1.2.1/debian/changelog
--- freediameter-1.2.1/debian/changelog	2021-03-22 18:03:02.000000000 +0100
+++ freediameter-1.2.1/debian/changelog	2021-03-23 17:46:41.000000000 +0100
@@ -1,3 +1,10 @@
+freediameter (1.2.1-8.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the host architecture strip. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 23 Mar 2021 17:46:41 +0100
+
 freediameter (1.2.1-8) unstable; urgency=medium
 
   * Team upload
diff --minimal -Nru freediameter-1.2.1/debian/rules freediameter-1.2.1/debian/rules
--- freediameter-1.2.1/debian/rules	2018-10-14 10:26:18.000000000 +0200
+++ freediameter-1.2.1/debian/rules	2021-03-23 17:46:40.000000000 +0100
@@ -3,14 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildtools.mk
 include /usr/share/dpkg/pkg-info.mk
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 CHANGELOG_DATE ?= $(shell LC_ALL=C date -u -d @$(SOURCE_DATE_EPOCH) +"%d %B %Y")
 
 arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
@@ -23,7 +23,7 @@
 
 override_dh_strip:
 	dh_strip
-	strip --remove-section=.comment debian/freediameter-extensions/usr/lib/freeDiameter/*
+	$(STRIP) --remove-section=.comment debian/freediameter-extensions/usr/lib/freeDiameter/*
 
 override_dh_installchangelogs:
 	dh_installchangelogs contrib/debian/changelog