Source: exif Version: 0.6.21-1 Tags: patch upstream User: [email protected] Usertags: rebootstrap
exif fails to cross build from source, because GP_PKG_CONFIG fails to consider $ac_tool_prefix when searching for pkg-config. Thus it fails finding required libraries as those are only requested for the host architecture. Replacing it with the upstream equivalent PKG_PROG_PKG_CONFIG fixes the cross build. Please consider applying the attached patch after stretch is released. Helmut
diff --minimal -Nru exif-0.6.21/debian/changelog exif-0.6.21/debian/changelog --- exif-0.6.21/debian/changelog 2013-01-28 19:28:37.000000000 +0100 +++ exif-0.6.21/debian/changelog 2017-03-18 11:20:43.000000000 +0100 @@ -1,3 +1,10 @@ +exif (0.6.21-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: cross.patch (Closes: #-1) + + -- Helmut Grohne <[email protected]> Sat, 18 Mar 2017 11:20:43 +0100 + exif (0.6.21-1) unstable; urgency=low * New upstream release diff --minimal -Nru exif-0.6.21/debian/patches/cross.patch exif-0.6.21/debian/patches/cross.patch --- exif-0.6.21/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ exif-0.6.21/debian/patches/cross.patch 2017-03-18 11:20:43.000000000 +0100 @@ -0,0 +1,79 @@ +From: Helmut Grohne <[email protected]> +Subject: Fix cross compilation + +Replace GP_PKG_CONFIG with upstream macro PKG_PROG_PKG_CONFIG as the former +fails to consider $ac_tool_prefix. + +Index: exif-0.6.21/configure.ac +=================================================================== +--- exif-0.6.21.orig/configure.ac ++++ exif-0.6.21/configure.ac +@@ -37,8 +37,6 @@ + + AC_CHECK_FUNCS([isatty fileno]) + +-GP_PKG_CONFIG +- + # --------------------------------------------------------------------------- + # i18n support + # --------------------------------------------------------------------------- +Index: exif-0.6.21/m4m/gp-check-library.m4 +=================================================================== +--- exif-0.6.21.orig/m4m/gp-check-library.m4 ++++ exif-0.6.21/m4m/gp-check-library.m4 +@@ -103,7 +103,7 @@ + # ---------------------------------------------------------------------- + dnl + AC_REQUIRE([GP_CONFIG_MSG])dnl +-AC_REQUIRE([GP_PKG_CONFIG])dnl ++AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + AC_REQUIRE([_GP_CHECK_LIBRARY_SOEXT])dnl + dnl Use _CFLAGS and _LIBS given to configure. + dnl This makes it possible to set these vars in a configure script +Index: exif-0.6.21/m4m/gp-pkg-config.m4 +=================================================================== +--- exif-0.6.21.orig/m4m/gp-pkg-config.m4 ++++ /dev/null +@@ -1,42 +0,0 @@ +-dnl @synopsis GP_PKG_CONFIG +-dnl +-dnl If you want to set the PKG_CONFIG_PATH, best do so before +-dnl calling GP_PKG_CONFIG +-AC_DEFUN([GP_PKG_CONFIG],[ +-# +-# [GP_PKG_CONFIG] +-# +-AC_ARG_VAR([PKG_CONFIG],[pkg-config package config utility]) +-export PKG_CONFIG +-AC_ARG_VAR([PKG_CONFIG_PATH],[directory where pkg-config looks for *.pc files]) +-export PKG_CONFIG_PATH +- +-AC_MSG_CHECKING([PKG_CONFIG_PATH]) +-if test "x${PKG_CONFIG_PATH}" = "x"; then +- AC_MSG_RESULT([empty]) +-else +- AC_MSG_RESULT([${PKG_CONFIG_PATH}]) +-fi +- +-dnl AC_REQUIRE([PKG_CHECK_MODULES]) +-AC_PATH_PROG([PKG_CONFIG],[pkg-config],[false]) +-if test "$PKG_CONFIG" = "false"; then +-AC_MSG_ERROR([ +-*** Build requires pkg-config +-*** +-*** Possible solutions: +-*** - set PKG_CONFIG to where your pkg-config is located +-*** - set PATH to include the directory where pkg-config is installed +-*** - get it from http://freedesktop.org/software/pkgconfig/ and install it +-]) +-fi +-])dnl +- +-dnl Please do not remove this: +-dnl filetype: d87b877b-80ec-447c-b042-21ec4a27c6f0 +-dnl I use this to find all the different instances of this file which +-dnl are supposed to be synchronized. +- +-dnl Local Variables: +-dnl mode: autoconf +-dnl End: diff --minimal -Nru exif-0.6.21/debian/patches/series exif-0.6.21/debian/patches/series --- exif-0.6.21/debian/patches/series 2013-01-27 15:47:53.000000000 +0100 +++ exif-0.6.21/debian/patches/series 2017-03-18 10:18:45.000000000 +0100 @@ -1 +1,2 @@ fix_hyphens_manpage +cross.patch
_______________________________________________ Pkg-phototools-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-phototools-devel
