Bug#933084: vdr-plugin-fritzbox FTCBFS: uses the build architecture pkg-config

[Helmut Grohne]

Source: vdr-plugin-fritzbox
Version: 1.5.3-8
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

vdr-plugin-fritzbox fails to cross build from source, because it uses
the build architecture pkg-config. The attached patch makes it
substitutable and exports a PKG_CONFIG for all targets as only
dh_auto_build supplies it normally. Please consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru vdr-plugin-fritzbox-1.5.3/debian/changelog vdr-plugin-fritzbox-1.5.3/debian/changelog
--- vdr-plugin-fritzbox-1.5.3/debian/changelog	2019-07-19 08:11:14.000000000 +0200
+++ vdr-plugin-fritzbox-1.5.3/debian/changelog	2019-07-26 15:28:31.000000000 +0200
@@ -1,3 +1,10 @@
+vdr-plugin-fritzbox (1.5.3-8.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the host architecture pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 26 Jul 2019 15:28:31 +0200
+
 vdr-plugin-fritzbox (1.5.3-8) unstable; urgency=medium
 
   * Build-depend on vdr-dev >= 2.4.1
diff --minimal -Nru vdr-plugin-fritzbox-1.5.3/debian/patches/cross.patch vdr-plugin-fritzbox-1.5.3/debian/patches/cross.patch
--- vdr-plugin-fritzbox-1.5.3/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ vdr-plugin-fritzbox-1.5.3/debian/patches/cross.patch	2019-07-26 15:28:28.000000000 +0200
@@ -0,0 +1,12 @@
+--- vdr-plugin-fritzbox-1.5.3.orig/Makefile
++++ vdr-plugin-fritzbox-1.5.3/Makefile
+@@ -16,7 +16,8 @@
+ ### The directory environment:
+ 
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
++PKG_CONFIG ?= pkg-config
++PKGCFG = $(if $(VDRDIR),$(shell $(PKG_CONFIG) --variable=$(1) $(VDRDIR)/vdr.pc),$(shell $(PKG_CONFIG) --variable=$(1) vdr || $(PKG_CONFIG) --variable=$(1) ../../../vdr.pc))
+ LIBDIR = $(call PKGCFG,libdir)
+ LOCDIR = $(call PKGCFG,locdir)
+ PLGCFG = $(call PKGCFG,plgcfg)
diff --minimal -Nru vdr-plugin-fritzbox-1.5.3/debian/patches/series vdr-plugin-fritzbox-1.5.3/debian/patches/series
--- vdr-plugin-fritzbox-1.5.3/debian/patches/series	2019-07-19 08:11:14.000000000 +0200
+++ vdr-plugin-fritzbox-1.5.3/debian/patches/series	2019-07-26 15:28:11.000000000 +0200
@@ -1,2 +1,3 @@
 boost-1.67.diff
 format-security.patch
+cross.patch
diff --minimal -Nru vdr-plugin-fritzbox-1.5.3/debian/rules vdr-plugin-fritzbox-1.5.3/debian/rules
--- vdr-plugin-fritzbox-1.5.3/debian/rules	2019-07-19 08:11:14.000000000 +0200
+++ vdr-plugin-fritzbox-1.5.3/debian/rules	2019-07-26 15:28:31.000000000 +0200
@@ -2,6 +2,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+-include /usr/share/dpkg/buildtools.mk
+export PKG_CONFIG ?= pkg-config
 
 %:
 	dh $@ --with vdrplugin