[Debichem-devel] Bug#883868: gdis FTCBFS: uses the build architecture pkg-config

[Helmut Grohne]

Source: gdis
Version: 0.90-5
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

gdis fails to cross build from source, because it uses the build
architecture pkg-config and thus fails finding glib, which is only
requested for the host architecture. After making pkg-config
substitutable, gdis cross builds successfully. Please consider applying
the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru gdis-0.90/debian/changelog gdis-0.90/debian/changelog
--- gdis-0.90/debian/changelog	2013-08-06 15:19:27.000000000 +0200
+++ gdis-0.90/debian/changelog	2017-12-08 17:12:36.000000000 +0100
@@ -1,3 +1,10 @@
+gdis (0.90-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Make pkg-config substitutable (closes: #-1).
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 08 Dec 2017 17:12:36 +0100
+
 gdis (0.90-5) unstable; urgency=low
 
   * debian/control (DM-Upload-Allowed): Dropped.
diff --minimal -Nru gdis-0.90/debian/patches/debian_make.patch gdis-0.90/debian/patches/debian_make.patch
--- gdis-0.90/debian/patches/debian_make.patch	2013-08-06 15:19:17.000000000 +0200
+++ gdis-0.90/debian/patches/debian_make.patch	2017-12-08 17:12:31.000000000 +0100
@@ -4,11 +4,12 @@
 
 --- /dev/null
 +++ b/makefile.debian
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,20 @@
++PKG_CONFIG ?= pkg-config
 +CFLAGS ?= -g -Wall -O2
 +
-+override CFLAGS += `pkg-config --cflags gtk+-2.0 gthread-2.0 gtkglext-1.0 gmodule-2.0`
-+override LDLIBS += `pkg-config --libs gtk+-2.0 gthread-2.0 gtkglext-1.0 gmodule-2.0` -lm
++override CFLAGS += `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 gtkglext-1.0 gmodule-2.0`
++override LDLIBS += `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 gtkglext-1.0 gmodule-2.0` -lm
 +
 +USE_GUI = YES
 +override CFLAGS += -DWITH_GUI