[crda] 15/16: crda FTCBFS: uses build architecture tools

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository crda.

commit 11b0391a19ac5d754ca4b726beb2c525ca52aa51
Author: Helmut Grohne <helmut at subdivi.de>
Date:   Tue Aug 30 17:06:17 2016 +0200

    crda FTCBFS: uses build architecture tools
    
    [benh: Rebased for 3.18-1]
---
 debian/changelog           |  4 +++
 debian/patches/cross.patch | 63 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  7 ++++++
 4 files changed, 75 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dd9a5b5..baf8f24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 crda (3.18-1) UNRELEASED; urgency=medium
 
+  [ Ben Hutchings ]
   * New upstream version (Closes: #840623)
   * debian/control: Change Vcs-Git, Vcs-Browser and Homepage to canonical
     HTTP-S URLs
@@ -8,6 +9,9 @@ crda (3.18-1) UNRELEASED; urgency=medium
   * debian/control: Update Standards-Version to 3.9.8; no changes needed
   * debian/rules: Pass dpkg build flags to Makefile (Closes: #784917)
 
+  [ Helmut Grohne ]
+  * Fix FTCBFS: use triplet prefixed tools (Closes: #836093)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 30 Aug 2015 13:07:58 +0100
 
 crda (3.13-1) unstable; urgency=medium
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..8c97f40
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,63 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: make pkg-config substitutable
+Date: Tue, 30 Aug 2016 16:59:36 +0200
+
+--- a/Makefile
++++ b/Makefile
+@@ -25,6 +25,8 @@ UDEV_RULE_DIR?=/lib/udev/rules.d/
+ PUBKEY_DIR?=pubkeys
+ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+ 
++PKG_CONFIG ?= pkg-config
++
+ CFLAGS += -O2 -fpic
+ CFLAGS += -std=gnu99 -Wall -Werror -pedantic
+ CFLAGS += -Wall -g
+@@ -39,8 +41,8 @@ all: all_noverify verify
+ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize
+ 
+ ifeq ($(USE_OPENSSL),1)
+-CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
+-LIBREGLDLIBS += `pkg-config --libs openssl`
++CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `$(PKG_CONFIG) --cflags openssl`
++LIBREGLDLIBS += `$(PKG_CONFIG) --libs openssl`
+ 
+ ifeq ($(RUNTIME_PUBKEY_ONLY),1)
+ CFLAGS += -DRUNTIME_PUBKEY_ONLY
+@@ -59,19 +61,19 @@ endif
+ MKDIR ?= mkdir -p
+ INSTALL ?= install
+ 
+-NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y)
+-NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y)
+-NL3FOUND := $(shell pkg-config --atleast-version=3 libnl-3.0 && echo Y)
+-NL32FOUND := $(shell pkg-config --atleast-version=3 libnl-3.2 && echo Y)
++NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
++NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
++NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
++NL32FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.2 && echo Y)
+ 
+ ifeq ($(NL32FOUND),Y)
+ CFLAGS += -DCONFIG_LIBNL30
+-NLLIBS += $(shell pkg-config --libs libnl-genl-3.2)
++NLLIBS += $(shell $(PKG_CONFIG) --libs libnl-genl-3.2)
+ NLLIBNAME = libnl-3.2
+ else
+ 	ifeq ($(NL3FOUND),Y)
+ 	CFLAGS += -DCONFIG_LIBNL30
+-	NLLIBS += $(shell pkg-config --libs libnl-genl-3.0)
++	NLLIBS += $(shell $(PKG_CONFIG) --libs libnl-genl-3.0)
+ 	NLLIBNAME = libnl-3.0
+ 	else
+ 		ifeq ($(NL2FOUND),Y)
+@@ -90,8 +92,8 @@ ifeq ($(NLLIBNAME),)
+ $(error Cannot find development files for any supported version of libnl)
+ endif
+ 
+-NLLIBS += `pkg-config --libs $(NLLIBNAME)`
+-CFLAGS += `pkg-config --cflags $(NLLIBNAME)`
++NLLIBS += `$(PKG_CONFIG) --libs $(NLLIBNAME)`
++CFLAGS += `$(PKG_CONFIG) --cflags $(NLLIBNAME)`
+ 
+ ifeq ($(V),1)
+ Q=
diff --git a/debian/patches/series b/debian/patches/series
index a6bd72a..0022cfa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 do_not_embed_pubkeys.patch
 do-not-run-ldconfig-if-destdir-is-set.patch
 fix-linking-of-libraries-used-by-reglib.patch
+cross.patch
diff --git a/debian/rules b/debian/rules
index a7c5f63..b9587a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,12 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CC),default)
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
+export CC
+export PKG_CONFIG = $(DEB_HOST_GNU_TYPE)-pkg-config
+
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/crda.git