[SCM] snd/master: Fix FTCBFS: Use the right pkg-config.

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Sun Dec 10 19:21:55 UTC 2017


The following commit has been merged in the master branch:
commit 3952568d4574b572c6280d9743df4db8d74bbfb3
Author: IOhannes m zmölnig <zmoelnig at umlautS.umlaeute.mur.at>
Date:   Sun Dec 10 20:20:22 2017 +0100

    Fix FTCBFS: Use the right pkg-config.
    
    Closes: #883885
    Thanks: Helmut Grohne <helmut at subdivi.de>

diff --git a/debian/rules b/debian/rules
index 3486744..83a32a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,10 +29,12 @@ DEB_BUILDDIR = build
 
 export AUTOHEADER=true
 
+-include /usr/share/dpkg/buildtools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/utils.mk
+PKG_CONFIG ?= pkg-config
 
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \
 	^(pix/.*\.png|debian/(changelog|copyright(|_hints|_newhints)))$
@@ -76,7 +78,7 @@ CPPFLAGS+=-DREPRODUCIBLE_BUILD=1
 
 # upstream naively (and wrongly) assumes
 # that they only need to link against "-lpulse-simple"
-DEB_MAKE_EXTRA_ARGS_gtk-pulse=AUDIO_LIB="$(shell pkg-config --libs libpulse-simple)"
+DEB_MAKE_EXTRA_ARGS_gtk-pulse=AUDIO_LIB="$(shell $(PKG_CONFIG) --libs libpulse-simple)"
 
 ## append any extra args for make
 DEB_MAKE_EXTRA_ARGS += $(DEB_MAKE_EXTRA_ARGS_$(cdbs_make_curflavor))

-- 
snd packaging



More information about the pkg-multimedia-commits mailing list