From 05628e7a160d5f1143e0a62a81d8122ed3ef6e7e Mon Sep 17 00:00:00 2001
From: David Leonard <david.leonard@opengear.com>
Date: Wed, 30 Mar 2016 11:38:21 +1000
Subject: [PATCH] debian/rules: fix linux_tools when cross-compiling

Fixed invocation of dh_shlibdeps when cross-compiling with
do_linux_tools=true.
Without being told where to find the crossdev libs, dh_shlibdeps
will emit these warnings and fail the linux-tools package:

  Debug: binary-acm7xxx
  ...
  dh_shlibdeps -plinux-headers-4.4.0-15-generic
  arm-linux-gnueabihf-objdump: .../asn1_compiler: File format not recognized
  arm-linux-gnueabihf-objdump: .../extract-cert: File format not recognized
  ...
---
 debian/rules.d/2-binary-arch.mk | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index f5b7464..6c37487 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -15,6 +15,8 @@ ifneq ($(gcc),)
 kmake += CC=$(CROSS_COMPILE)$(gcc)
 endif
 
+shlibdeps_opts = $(if $(CROSS_COMPILE),-- -l$(CROSS_COMPILE:%-=/usr/%)/lib)
+
 $(stampdir)/stamp-prepare-%: config-prepare-check-%
 	@echo Debug: $@
 	@touch $@
@@ -453,7 +455,7 @@ binary-%: install-%
 	dh_compress -p$(pkgimg)
 	dh_fixperms -p$(pkgimg) -X/boot/
 	dh_installdeb -p$(pkgimg)
-	dh_shlibdeps -p$(pkgimg)
+	dh_shlibdeps -p$(pkgimg) $(shlibdeps_opts)
 	$(lockme) dh_gencontrol -p$(pkgimg)
 	dh_md5sums -p$(pkgimg)
 	dh_builddeb -p$(pkgimg) -- -Zbzip2 -z9
@@ -465,7 +467,7 @@ ifeq ($(do_extras_package),true)
 		dh_compress -p$(pkgimg_ex); \
 		dh_fixperms -p$(pkgimg_ex) -X/boot/; \
 		dh_installdeb -p$(pkgimg_ex); \
-		dh_shlibdeps -p$(pkgimg_ex); \
+		dh_shlibdeps -p$(pkgimg_ex) $(shlibdeps_opts); \
 		$(lockme) dh_gencontrol -p$(pkgimg_ex); \
 		dh_md5sums -p$(pkgimg_ex); \
 		dh_builddeb -p$(pkgimg_ex) -- -Zbzip2 -z9; \
@@ -476,7 +478,7 @@ endif
 	dh_installdocs -p$(pkghdr)
 	dh_compress -p$(pkghdr)
 	dh_fixperms -p$(pkghdr)
-	dh_shlibdeps -p$(pkghdr)
+	dh_shlibdeps -p$(pkghdr) $(shlibdeps_opts)
 	dh_installdeb -p$(pkghdr)
 	$(lockme) dh_gencontrol -p$(pkghdr)
 	dh_md5sums -p$(pkghdr)
@@ -489,7 +491,7 @@ ifneq ($(skipsub),true)
 		dh_installdocs -p$$pkg;			\
 		dh_compress -p$$pkg;			\
 		dh_fixperms -p$$pkg -X/boot/;		\
-		dh_shlibdeps -p$$pkg;			\
+		dh_shlibdeps -p$$pkg $(shlibdeps_opts);	\
 		dh_installdeb -p$$pkg;			\
 		$(lockme) dh_gencontrol -p$$pkg;			\
 		dh_md5sums -p$$pkg;			\
@@ -534,7 +536,7 @@ ifeq ($(do_linux_tools),true)
 	dh_installdocs -p$(pkgtools)
 	dh_compress -p$(pkgtools)
 	dh_fixperms -p$(pkgtools)
-	dh_shlibdeps -p$(pkgtools)
+	dh_shlibdeps -p$(pkgtools) $(shlibdeps_opts)
 	dh_installdeb -p$(pkgtools)
 	$(lockme) dh_gencontrol -p$(pkgtools)
 	dh_md5sums -p$(pkgtools)
@@ -545,7 +547,7 @@ ifeq ($(do_cloud_tools),true)
 	dh_installdocs -p$(pkgcloud)
 	dh_compress -p$(pkgcloud)
 	dh_fixperms -p$(pkgcloud)
-	dh_shlibdeps -p$(pkgcloud)
+	dh_shlibdeps -p$(pkgcloud) $(shlibdeps_opts)
 	dh_installdeb -p$(pkgcloud)
 	$(lockme) dh_gencontrol -p$(pkgcloud)
 	dh_md5sums -p$(pkgcloud)
@@ -669,7 +671,7 @@ ifeq ($(do_linux_tools),true)
 	dh_installdocs -p$(toolspkg)
 	dh_compress -p$(toolspkg)
 	dh_fixperms -p$(toolspkg)
-	dh_shlibdeps -p$(toolspkg)
+	dh_shlibdeps -p$(toolspkg) $(shlibdeps_opts)
 	dh_installdeb -p$(toolspkg)
 	$(lockme) dh_gencontrol -p$(toolspkg)
 	dh_md5sums -p$(toolspkg)
@@ -681,7 +683,7 @@ ifeq ($(do_cloud_tools),true)
 	dh_installdocs -p$(cloudpkg)
 	dh_compress -p$(cloudpkg)
 	dh_fixperms -p$(cloudpkg)
-	dh_shlibdeps -p$(cloudpkg)
+	dh_shlibdeps -p$(cloudpkg) $(shlibdeps_opts)
 	dh_installdeb -p$(cloudpkg)
 	$(lockme) dh_gencontrol -p$(cloudpkg)
 	dh_md5sums -p$(cloudpkg)
-- 
2.6.2