Source: vdr-plugin-remote Version: 0.7.0-3 Tags: patch User: [email protected] Usertags: ftcbfs
vdr-plugin-remote 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
diff --minimal -Nru vdr-plugin-remote-0.7.0/debian/changelog vdr-plugin-remote-0.7.0/debian/changelog --- vdr-plugin-remote-0.7.0/debian/changelog 2019-07-20 05:34:59.000000000 +0200 +++ vdr-plugin-remote-0.7.0/debian/changelog 2019-07-26 20:34:54.000000000 +0200 @@ -1,3 +1,10 @@ +vdr-plugin-remote (0.7.0-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Use the host architecture pkg-config. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Fri, 26 Jul 2019 20:34:54 +0200 + vdr-plugin-remote (0.7.0-3) unstable; urgency=medium * Build-depend on vdr-dev >= 2.4.1 diff --minimal -Nru vdr-plugin-remote-0.7.0/debian/patches/cross.patch vdr-plugin-remote-0.7.0/debian/patches/cross.patch --- vdr-plugin-remote-0.7.0/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ vdr-plugin-remote-0.7.0/debian/patches/cross.patch 2019-07-26 20:34:53.000000000 +0200 @@ -0,0 +1,12 @@ +--- vdr-plugin-remote-0.7.0.orig/Makefile ++++ vdr-plugin-remote-0.7.0/Makefile +@@ -31,7 +31,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 = $(DESTDIR)$(call PKGCFG,libdir) + LOCDIR = $(DESTDIR)$(call PKGCFG,locdir) + PLGCFG = $(call PKGCFG,plgcfg) diff --minimal -Nru vdr-plugin-remote-0.7.0/debian/patches/series vdr-plugin-remote-0.7.0/debian/patches/series --- vdr-plugin-remote-0.7.0/debian/patches/series 2019-07-20 05:34:59.000000000 +0200 +++ vdr-plugin-remote-0.7.0/debian/patches/series 2019-07-26 20:34:21.000000000 +0200 @@ -1 +1,2 @@ disable-po-update.patch +cross.patch diff --minimal -Nru vdr-plugin-remote-0.7.0/debian/rules vdr-plugin-remote-0.7.0/debian/rules --- vdr-plugin-remote-0.7.0/debian/rules 2019-07-20 05:34:59.000000000 +0200 +++ vdr-plugin-remote-0.7.0/debian/rules 2019-07-26 20:34:54.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
_______________________________________________ pkg-vdr-dvb-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-vdr-dvb-devel
