Source: util-linux Version: 2.27.1-1 Tags: patch User: [email protected] Usertags: rebootstrap
Hi Andreas, I noticed that the non-staged util-linux cross build fails finding libselinux. Even though it correctly picks up the host arch triplet prefixed cross pkg-config, it still uses plain pkg-config for discovering libselinux. Since libselinux1-dev is only requested for the host architecture, configure fails. Please consider applying the attached patch. Helmut
diff --minimal -Nru util-linux-2.27.1/debian/changelog util-linux-2.27.1/debian/changelog --- util-linux-2.27.1/debian/changelog +++ util-linux-2.27.1/debian/changelog @@ -1,3 +1,10 @@ +util-linux (2.27.1-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: use $triplet-pkg-config in all places (Closes: #-1) + + -- Helmut Grohne <[email protected]> Tue, 19 Jan 2016 17:54:45 +0100 + util-linux (2.27.1-1) unstable; urgency=medium * Imported Upstream version 2.27.1 diff --minimal -Nru util-linux-2.27.1/debian/patches/cross-pkg-config.patch util-linux-2.27.1/debian/patches/cross-pkg-config.patch --- util-linux-2.27.1/debian/patches/cross-pkg-config.patch +++ util-linux-2.27.1/debian/patches/cross-pkg-config.patch @@ -0,0 +1,13 @@ +--- a/m4/ul.m4 ++++ b/m4/ul.m4 +@@ -30,8 +30,8 @@ + dnl Calls pkg-config --static + dnl + AC_DEFUN([UL_PKG_STATIC], [ +- if AC_RUN_LOG([pkg-config --exists --print-errors "$2"]); then +- $1=`pkg-config --libs --static "$2"` ++ if AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$2"]); then ++ $1=`$PKG_CONFIG --libs --static "$2"` + else + AC_MSG_ERROR([pkg-config description of $2, needed for static build, is not available]) + fi diff --minimal -Nru util-linux-2.27.1/debian/patches/series util-linux-2.27.1/debian/patches/series --- util-linux-2.27.1/debian/patches/series +++ util-linux-2.27.1/debian/patches/series @@ -2,3 +2,4 @@ man-page-tweaks-cleanup-my_dev_t.h-ancient-stuff.patch Disable-the-fallback-clause-in-hwclock-when-dev-rtc-.patch verbose-tests.patch +cross-pkg-config.patch
