[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#933027: vdr-plugin-vnsiserver FTCBFS: uses the build architecture pkg-config



Source: vdr-plugin-vnsiserver
Version: 1:1.8.0-2
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs

vdr-plugin-vnsiserver fails to cross build from source, because it hard
codes the build architecture pkg-config in the upstream Makefile. It
needs to be made substitutable and available for all targets (not just
via dh_auto_build) to become cross buildable. Please consider applying
the attached patch.

Helmut
diff --minimal -Nru vdr-plugin-vnsiserver-1.8.0/debian/changelog vdr-plugin-vnsiserver-1.8.0/debian/changelog
--- vdr-plugin-vnsiserver-1.8.0/debian/changelog	2019-07-20 11:05:44.000000000 +0200
+++ vdr-plugin-vnsiserver-1.8.0/debian/changelog	2019-07-25 21:57:39.000000000 +0200
@@ -1,3 +1,10 @@
+vdr-plugin-vnsiserver (1:1.8.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the host architecture pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Thu, 25 Jul 2019 21:57:39 +0200
+
 vdr-plugin-vnsiserver (1:1.8.0-2) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --minimal -Nru vdr-plugin-vnsiserver-1.8.0/debian/patches/cross.patch vdr-plugin-vnsiserver-1.8.0/debian/patches/cross.patch
--- vdr-plugin-vnsiserver-1.8.0/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ vdr-plugin-vnsiserver-1.8.0/debian/patches/cross.patch	2019-07-25 21:57:28.000000000 +0200
@@ -0,0 +1,12 @@
+--- vdr-plugin-vnsiserver-1.8.0.orig/Makefile
++++ vdr-plugin-vnsiserver-1.8.0/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-vnsiserver-1.8.0/debian/patches/series vdr-plugin-vnsiserver-1.8.0/debian/patches/series
--- vdr-plugin-vnsiserver-1.8.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ vdr-plugin-vnsiserver-1.8.0/debian/patches/series	2019-07-25 21:57:00.000000000 +0200
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru vdr-plugin-vnsiserver-1.8.0/debian/rules vdr-plugin-vnsiserver-1.8.0/debian/rules
--- vdr-plugin-vnsiserver-1.8.0/debian/rules	2019-07-20 11:05:44.000000000 +0200
+++ vdr-plugin-vnsiserver-1.8.0/debian/rules	2019-07-25 21:57:39.000000000 +0200
@@ -6,6 +6,9 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+-include /usr/share/dpkg/buildtools.mk
+export PKG_CONFIG ?= pkg-config
+
 PLG_PACKAGE = $(filter-out %-dbg, $(shell dh_listpackages))
 DBG_PACKAGE = $(filter %-dbg, $(shell dh_listpackages))
 

Reply to: