[Debichem-devel] Bug#866703: chemtool FTCBFS: uses the build architecture pkg-config

[Helmut Grohne]

Source: chemtool
Version: 1.6.14-1
Tags: upstream patch
User: helmutg at debian.org
Usertags: rebootstrap

chemtool fails to cross build from source, because it uses the build
architecture pkg-config in ./configure. The proper way to detect
pkg-config is the PKG_PROG_PKG_CONFIG macro and after doing so (and thus
autoreconfing), chemtool cross builds successfully. Please consider
applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru chemtool-1.6.14/debian/changelog chemtool-1.6.14/debian/changelog
--- chemtool-1.6.14/debian/changelog	2013-08-13 23:39:19.000000000 +0200
+++ chemtool-1.6.14/debian/changelog	2017-07-01 07:56:52.000000000 +0200
@@ -1,3 +1,12 @@
+chemtool (1.6.14-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + cross.patch
+    + Enable autoreconf for cross.patch
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 01 Jul 2017 07:56:52 +0200
+
 chemtool (1.6.14-1) unstable; urgency=low
 
   * New upstream release.
diff --minimal -Nru chemtool-1.6.14/debian/patches/cross.patch chemtool-1.6.14/debian/patches/cross.patch
--- chemtool-1.6.14/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ chemtool-1.6.14/debian/patches/cross.patch	2017-07-01 07:56:50.000000000 +0200
@@ -0,0 +1,21 @@
+From: Helmut Grohne <helmut at subdivi.de>
+Subject: consider $ac_tool_prefix for pkg-config
+
+Index: chemtool-1.6.14/configure.ac
+===================================================================
+--- chemtool-1.6.14.orig/configure.ac
++++ chemtool-1.6.14/configure.ac
+@@ -28,11 +28,11 @@
+ AC_ARG_ENABLE(enable_gtk1,
+ [  --enable-gtk1           Use GTK+-1.x even if GTK+-2.x is available [no]],enable_gtk1=no)
+ 
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++PKG_PROG_PKG_CONFIG
+ 
+ AC_MSG_CHECKING([for GTK version and compile options ])
+ 
+-if test x$PKG_CONFIG = xno -o x$enable_gtk1 = xyes ; then
++if test x$PKG_CONFIG = x -o x$enable_gtk1 = xyes ; then
+ AM_PATH_GTK(1.0.2, , exit 1)
+ else
+ if $PKG_CONFIG gtk+-2.0 --cflags ; then
diff --minimal -Nru chemtool-1.6.14/debian/patches/series chemtool-1.6.14/debian/patches/series
--- chemtool-1.6.14/debian/patches/series	2011-12-29 19:17:46.000000000 +0100
+++ chemtool-1.6.14/debian/patches/series	2017-07-01 07:55:52.000000000 +0200
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru chemtool-1.6.14/debian/rules chemtool-1.6.14/debian/rules
--- chemtool-1.6.14/debian/rules	2013-08-13 23:39:05.000000000 +0200
+++ chemtool-1.6.14/debian/rules	2017-07-01 07:55:48.000000000 +0200
@@ -9,7 +9,7 @@
 export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 %:
-	dh $@ --with autotools_dev --parallel
+	dh $@ --with autoreconf --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- --without-gnomedir --without-kdedir