[med-svn] [exonerate] 01/04: make pkg-config macro cross compilation safe

[Andreas Tille]

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

tille pushed a commit to branch master
in repository exonerate.

commit 25e46e1099d835b71c29850cc79fdbacf90446a0
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jan 23 11:34:40 2018 +0100

    make pkg-config macro cross compilation safe
---
 debian/changelog           | 10 +++++++++-
 debian/patches/cross.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 578c367..59a6b9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
 exonerate (2.4.0-3) UNRELEASED; urgency=medium
 
+  [ Steffen Moeller ]
   * debian/upstream/metadata: Added references to registries.
 
- -- Steffen Moeller <moeller at debian.org>  Mon, 18 Sep 2017 02:25:47 +0200
+  [ Helmut Grohne ]
+  * make pkg-config macro cross compilation safe
+    Closes: #888032
+
+  [ Andreas Tille ]
+  * 
+
+ -- Andreas Tille <tille at debian.org>  Tue, 23 Jan 2018 11:25:09 +0100
 
 exonerate (2.4.0-2) unstable; urgency=medium
 
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..795e1e3
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,40 @@
+Author: Helmut Grohne <helmut at subdivi.de>
+Last-Update: Mon, 22 Jan 2018 20:34:16 +0100
+Bug-Debian: https://bugs.debian.org/888032
+Description: make pkg-config macro cross compilation safe
+
+--- a/configure.in
++++ b/configure.in
+@@ -103,19 +103,19 @@ AC_ARG_ENABLE(glib2,
+   --enable-glib2  Use glib2 library
+   --disable-glib2 Do not glib2 (use glib1 instead)],
+ [enable_glib2="$enableval"],[enable_glib2=yes])
++PKG_PROG_PKG_CONFIG
+ if test "$enable_glib2" = yes; then
+ #    AM_PATH_GLIB_2_0(2.0.0,
+ #            [LIBS="$LIBS $GLIB_LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS"],
+ #            AC_MSG_ERROR(Cannot find GLIB2: Is pkg-config in path?))
+ #    PKG_CHECK_MODULES(GLIB, [glib-2.0], [:], [:])
+-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-    if test "$PKG_CONFIG" = no; then
++    if test "x$PKG_CONFIG" = x; then
+         echo "ERROR: Could not find pkg-config ... is glib-2 installed ???"
+         exit 1
+     fi
+     echo "Using GLIB-2"
+-    glib_cflags=`pkg-config --cflags glib-2.0`
+-    glib_libs=`pkg-config --libs glib-2.0`
++    glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
++    glib_libs=`$PKG_CONFIG --libs glib-2.0`
+     CFLAGS="$CFLAGS $glib_cflags"
+     LIBS="$LIBS $glib_libs"
+ elif test "$enable_glib2" = no; then
+@@ -299,7 +299,7 @@ if test "$enable_pthreads" = yes; then
+     echo "Using PTHREADS"
+     CFLAGS="$CFLAGS -DUSE_PTHREADS"
+     # for g_thread_init()
+-    g_thread_init_ldflags=`pkg-config --libs gthread-2.0`
++    g_thread_init_ldflags=`$PKG_CONFIG --libs gthread-2.0`
+     LDFLAGS="$LDFLAGS $g_thread_init_ldflags -lpthread"
+ elif test "$enable_pthreads" = no; then
+     echo "Not using pthreads"
diff --git a/debian/patches/series b/debian/patches/series
index 9bbb94d..35010fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_build-as-needed.patch
 manpages.patch
 spelling.patch
 manpagesyntax.patch
+cross.patch

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