[pkg-wpa-devel] [wpa] 01/02: Address FTCBFS: Set PKG_CONFIG (Closes: #836074).

[Andrew Shadura]

This is an automated email from the git hooks/post-receive script.

andrewsh pushed a commit to branch debian/sid
in repository wpa.

commit 83adb3924e738ced86c19f791cf65ea720caf147
Author: Helmut Grohne <helmut at subdivi.de>
Date:   Tue Aug 30 14:47:51 2016 +0200

    Address FTCBFS: Set PKG_CONFIG (Closes: #836074).
---
 debian/changelog                                            | 6 ++++++
 debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch | 2 +-
 debian/rules                                                | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ae4a62..e80b167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wpa (2.5-2+v2.4-3) UNRELEASED; urgency=medium
+
+  * Address FTCBFS: Set PKG_CONFIG (Closes: #836074).
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 30 Aug 2016 14:19:27 +0200
+
 wpa (2.5-2+v2.4-2) unstable; urgency=medium
 
   * Apply patches from upstream to unbreak dedicated P2P Device support
diff --git a/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch b/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
index 14d2041..fab6257 100644
--- a/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
+++ b/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
@@ -10,7 +10,7 @@ Author: Reinhard Tartler <siretart at tauware.de>
  #LIBS += -lwinscard
  else
 -LIBS += -lpcsclite -lpthread
-+LIBS += $(shell pkg-config --libs libpcsclite)
++LIBS += $(shell $(PKG_CONFIG) --libs libpcsclite)
  endif
  endif
  
diff --git a/debian/rules b/debian/rules
index b77b774..b1f8e49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,13 +15,13 @@ UCFLAGS   = -MMD -Wall -g -Os -fPIC
 BINDIR    = /sbin
 V = 1
 
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+ifeq ($(origin CC),default)
 	CC=$(DEB_HOST_GNU_TYPE)-gcc
 endif
+PKG_CONFIG ?= $(DEB_HOST_GNU_TYPE)-pkg-config
 
-export CC BINDIR V
+export CC BINDIR V PKG_CONFIG
 
 DEB_HOST_ARCH_OS              ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 HOSTAPD_DOT_CONFIG            := debian/config/hostapd/$(DEB_HOST_ARCH_OS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wpa.git