Bug#871375: xbindkeys-config FTCBFS: uses the build architecture toolchain

[Helmut Grohne]

Source: xbindkeys-config
Version: 0.1.3-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

xbindkeys-config fails to cross build from source, because it uses the
build architecture toolchain. Letting dh_auto_build pass suitably
prefixed CC and PKG_CONFIG to a suitably updated Makefile makes the
cross build succeed. Please consider applying the attached patch.

Helmut

diff -u xbindkeys-config-0.1.3/Makefile xbindkeys-config-0.1.3/Makefile
--- xbindkeys-config-0.1.3/Makefile
+++ xbindkeys-config-0.1.3/Makefile
@@ -1,21 +1,22 @@
 # makefile crée par Laurent VUIBERT
 
-CC=    gcc $(CFLAGS)
+CC=    gcc
+PKG_CONFIG ?= pkg-config
 STD=   _GNU_SOURCE
-GTK=   `pkg-config  --cflags --libs gtk+-2.0`
-GTK2=  `pkg-config  --cflags gtk+-2.0`
+GTK=   `$(PKG_CONFIG)  --cflags --libs gtk+-2.0`
+GTK2=  `$(PKG_CONFIG)  --cflags gtk+-2.0`
 OBJS=  xbindkeys_config.o menu.o middle.o speedc.o
 NOM=    xbindkeys_config
 
 prefix=        /usr
 
 .c.o: 
-       $(CC) $(GTK2) -D$(STD) -c $<
+       $(CC) $(CFLAGS) $(GTK2) -D$(STD) -c $<
 
 all: main
 
 main: $(OBJS)
-       $(CC) $(GTK) $(OBJS) -o $(NOM)
+       $(CC) $(CFLAGS) $(GTK) $(OBJS) -o $(NOM)
 
 clean:
        rm -f *.o */*.o */*~ core $(NOM) *~
diff -u xbindkeys-config-0.1.3/debian/control 
xbindkeys-config-0.1.3/debian/control
--- xbindkeys-config-0.1.3/debian/control
+++ xbindkeys-config-0.1.3/debian/control
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Joerg Jaspert <jo...@debian.org>
-Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev
+Build-Depends: debhelper (>> 7), libgtk2.0-dev
 Standards-Version: 3.8.0
 
 Package: xbindkeys-config
diff -u xbindkeys-config-0.1.3/debian/rules xbindkeys-config-0.1.3/debian/rules
--- xbindkeys-config-0.1.3/debian/rules
+++ xbindkeys-config-0.1.3/debian/rules
@@ -21,7 +21,7 @@
 build-stamp:
        dh_testdir
 
-       CFLAGS='$(CFLAGS)' $(MAKE)
+       CFLAGS='$(CFLAGS)' dh_auto_build
        touch build-stamp
 
 clean:
diff -u xbindkeys-config-0.1.3/debian/changelog 
xbindkeys-config-0.1.3/debian/changelog
--- xbindkeys-config-0.1.3/debian/changelog
+++ xbindkeys-config-0.1.3/debian/changelog
@@ -1,3 +1,10 @@
+xbindkeys-config (0.1.3-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use cross toolchain (Closes: #-1).
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 07 Aug 2017 18:06:10 +0200
+
 xbindkeys-config (0.1.3-2) unstable; urgency=low
 
   * Upload based *heavily* on work from Barry. Thanks!