Source: xtables-addons Version: 2.12-0.1 Tags: upstream patch User: [email protected] Usertags: rebootstrap
xtables-addons fails to cross build from source, because it uses the build architecture pkg-config in one remaining place hard coded into configure.ac. It already discovers a proper pkg-config in $PKG_CONFIG, so simply replacing it with the variable fixes the cross build. Please consider applying the attached patch. I was unable to reproduce any cross issues mentioned in #776688 with version 2.12-0.1. At least that part seems fixed now. Not sure whether the versioned build-depends on binutils is still necessary. Maybe that bug can simply be closed now. Helmut
diff --minimal -Nru xtables-addons-2.12/debian/changelog xtables-addons-2.12/debian/changelog --- xtables-addons-2.12/debian/changelog 2017-01-29 00:15:35.000000000 +0100 +++ xtables-addons-2.12/debian/changelog 2017-06-30 20:29:25.000000000 +0200 @@ -1,3 +1,10 @@ +xtables-addons (2.12-0.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: cross.patch (Closes: #-1) + + -- Helmut Grohne <[email protected]> Fri, 30 Jun 2017 20:29:25 +0200 + xtables-addons (2.12-0.1) unstable; urgency=medium * Non-maintainer upload. diff --minimal -Nru xtables-addons-2.12/debian/patches/cross.patch xtables-addons-2.12/debian/patches/cross.patch --- xtables-addons-2.12/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ xtables-addons-2.12/debian/patches/cross.patch 2017-06-30 20:29:23.000000000 +0200 @@ -0,0 +1,16 @@ +From: Helmut Grohne <[email protected]> +Subject: consider $ac_tool_prefix for pkg-config + +Index: xtables-addons-2.12/configure.ac +=================================================================== +--- xtables-addons-2.12.orig/configure.ac ++++ xtables-addons-2.12/configure.ac +@@ -27,7 +27,7 @@ + AC_CHECK_HEADERS([linux/netfilter/x_tables.h], [], + [AC_MSG_ERROR([You need to have linux/netfilter/x_tables.h, see INSTALL file for details])]) + PKG_CHECK_MODULES([libxtables], [xtables >= 1.4.5]) +-xtlibdir="$(pkg-config --variable=xtlibdir xtables)" ++xtlibdir="$($PKG_CONFIG --variable=xtlibdir xtables)" + + AC_ARG_WITH([xtlibdir], + AS_HELP_STRING([--with-xtlibdir=PATH], diff --minimal -Nru xtables-addons-2.12/debian/patches/series xtables-addons-2.12/debian/patches/series --- xtables-addons-2.12/debian/patches/series 2017-01-29 00:13:50.000000000 +0100 +++ xtables-addons-2.12/debian/patches/series 2017-06-30 20:28:35.000000000 +0200 @@ -1 +1,2 @@ #automake-1.11.2.patch +cross.patch
