Source: echoping
Version: 6.0.2-10
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

echoping fails to cross build from source, because it uses the build
architecture pkg-config (introduced in the Debian patch
002-FTBFS_against_gnutls26_greater_the_2.7.x_fix.diff). Using a
triplet-prefixed pkg-config fixes the cross build. Please consider
applying the attached patch. In the long run, please consider using the
PKG_CHECK_MODULES m4 macro.

Helmut
diff --minimal -Nru echoping-6.0.2/debian/changelog 
echoping-6.0.2/debian/changelog
--- echoping-6.0.2/debian/changelog     2017-01-10 12:45:11.000000000 +0100
+++ echoping-6.0.2/debian/changelog     2017-01-26 20:04:15.000000000 +0100
@@ -1,3 +1,10 @@
+echoping (6.0.2-10.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use triplet-prefixed pkg-config (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 26 Jan 2017 20:04:15 +0100
+
 echoping (6.0.2-10) unstable; urgency=medium
 
   * debian/patch/006_reproducible-build.diff:
diff --minimal -Nru 
echoping-6.0.2/debian/patches/002-FTBFS_against_gnutls26_greater_the_2.7.x_fix.diff
 
echoping-6.0.2/debian/patches/002-FTBFS_against_gnutls26_greater_the_2.7.x_fix.diff
--- 
echoping-6.0.2/debian/patches/002-FTBFS_against_gnutls26_greater_the_2.7.x_fix.diff
 2014-06-22 19:34:24.000000000 +0200
+++ 
echoping-6.0.2/debian/patches/002-FTBFS_against_gnutls26_greater_the_2.7.x_fix.diff
 2017-01-26 20:03:48.000000000 +0100
@@ -3,7 +3,7 @@
 # Forwarded: 
http://sourceforge.net/tracker/?func=detail&aid=2811861&group_id=4581&atid=104581
 # Author: Kumar Appaiah <a.ku...@alumni.iitm.ac.in>
 # Bug-Debian: http://bugs.debian.org/529820
-# Last-Update: 2012-03-15
+# Last-Update: 2017-01-26
 #
 Index: echoping/configure
 ===================================================================
@@ -15,8 +15,8 @@
     GNUTLS=1
 -   CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`"
 -   LDFLAGS="${LDFLAGS} `libgnutls-config --libs`"
-+   CPPFLAGS="${CPPFLAGS} `pkg-config gnutls --cflags`"
-+   LDFLAGS="${LDFLAGS} `pkg-config gnutls --libs`"
++   CPPFLAGS="${CPPFLAGS} `$PKG_CONFIG gnutls --cflags`"
++   LDFLAGS="${LDFLAGS} `$PKG_CONFIG gnutls --libs`"
     if test "$withval" != "yes"; then
        GNUTLSROOT=$withval
        LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib"
@@ -25,7 +25,7 @@
  echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_global_init" >&6; }
  if test $ac_cv_lib_gnutls_gnutls_global_init = yes; then
 -  LIBS="${LIBS} `libgnutls-config --libs`"
-+  LIBS="${LIBS} `pkg-config gnutls --libs`"
++  LIBS="${LIBS} `$PKG_CONFIG gnutls --libs`"
  else
    { { echo "$as_me:$LINENO: error: Get the GNU TLS library 
(http://www.gnutls.org/)" >&5
  echo "$as_me: error: Get the GNU TLS library (http://www.gnutls.org/)" >&2;}
diff --minimal -Nru echoping-6.0.2/debian/rules echoping-6.0.2/debian/rules
--- echoping-6.0.2/debian/rules 2014-06-22 20:02:17.000000000 +0200
+++ echoping-6.0.2/debian/rules 2017-01-26 20:04:13.000000000 +0100
@@ -15,6 +15,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config
 
 
 #DEB_BUILD_MAINT_OPTIONS = hardening=+all

Reply via email to