[Pkg-xfce-devel] Bug#632502: src:xfce4-dev-tools: please use pkg-config's macro for detection, for cross-build compatibility
Steve Langasek
steve.langasek at ubuntu.com
Sat Jul 2 22:12:42 UTC 2011
Package: src:xfce4-dev-tools
Version: 4.8.0-1
Severity: normal
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch oneiric
Hi there,
When testing a cross-build of libxfce4util in connection with multiarch, I
found a bug whereby pkg-config was being detected instead of
arm-linux-gnueabi-pkg-config, which was odd because the standard pkg-config
macros (which get included in the libxfce4util aclocal.m4 anyway via
GTK_DOC_CHECK) work fine for cross-compilation: they invoke
AC_PATH_TOOL(pkg-config), where the XDT_PROG_PKG_CONFIG() macro calls
AC_PATH_PROG(pkg-config).
The attached patch addresses this by having XDT_PROG_PKG_CONFIG() call the
standard PKG_PROG_PKG_CONFIG() macro, which presumably is ok because
pkg-config should be available in the build environment. But if you prefer
not to add dependencies on external macros, then please at least update the
macro to call AC_PATH_TOOL() in place of AC_PATH_PROG().
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
vorlon at debian.org http://www.debian.org/
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: steve.langasek at canonical.com-20110702215903-\
# aogxqvchyg4zhmw9
# target_branch: :parent
# testament_sha1: 11e1e6eb30e66da71c68a6f46aaddd5011c95fe2
# timestamp: 2011-07-02 15:00:48 -0700
# base_revision_id: svn-v4:0c9b3bff-18ee-0310-b944-\
# d1aa2700132f:desktop/trunk/xfce4-dev-tools:5419
#
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog 2011-04-19 14:21:16 +0000
+++ debian/changelog 2011-07-02 21:59:03 +0000
@@ -1,3 +1,12 @@
+xfce4-dev-tools (4.8.0-1ubuntu1) UNRELEASED; urgency=low
+
+ * m4macros/xdt-depends.m4: fix pkg-config check to use the
+ PKG_PROG_PKG_CONFIG macro from pkg-config itself instead of searching
+ for pkg-config directly; this fixes the search to be compatible with
+ cross-building.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sat, 02 Jul 2011 21:45:46 +0000
+
xfce4-dev-tools (4.8.0-1) unstable; urgency=low
[ Lionel Le Folgoc ]
=== added directory 'debian/patches'
=== added file 'debian/patches/proper-pkg-config-check'
--- debian/patches/proper-pkg-config-check 1970-01-01 00:00:00 +0000
+++ debian/patches/proper-pkg-config-check 2011-07-02 21:59:03 +0000
@@ -0,0 +1,57 @@
+Description: fix pkg-config checking to be cross-compilation-safe
+ fix pkg-config check to use the PKG_PROG_PKG_CONFIG macro from
+ pkg-config itself instead of searching for pkg-config directly; this
+ fixes the search to be compatible with cross-building.
+Author: Steve Langasek <steve.langasek at canonical.com>
+
+--- xfce4-dev-tools-4.8.0.orig/m4macros/xdt-depends.m4
++++ xfce4-dev-tools-4.8.0/m4macros/xdt-depends.m4
+@@ -44,38 +44,18 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
+ xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0
+
+ # lookup pkg-config utility
++ PKG_PROG_PKG_CONFIG([$xdt_cv_PKG_CONFIG_MIN_VERSION])
+ if test x"$PKG_CONFIG" = x""; then
+- AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
+-
+- if test x"$PKG_CONFIG" = x"no"; then
+- echo "*** The pkg-config utility could not be found on your system."
+- echo "*** Make sure it is in your path, or set the PKG_CONFIG"
+- echo "*** environment variable to the full path to pkg-config."
+- echo "*** You can download pkg-config from the freedesktop.org"
+- echo "*** software repository at"
+- echo "***"
+- echo "*** http://www.freedesktop.org/software/pkgconfig"
+- echo "***"
+- exit 1
+- fi
+-
+- # check pkg-config version
+- AC_MSG_CHECKING([for pkg-config >= $xdt_cv_PKG_CONFIG_MIN_VERSION])
+- if $PKG_CONFIG --atleast-pkgconfig-version $xdt_cv_PKG_CONFIG_MIN_VERSION; then
+- xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
+- AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION])
+- else
+- xdt_cv_PKG_CONFIG_VERSION=`$PKG_CONFIG --version`
+- AC_MSG_RESULT([$xdt_cv_PKG_CONFIG_VERSION])
+- echo "*** Your version of pkg-config is too old. You need atleast"
+- echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config "
+- echo "*** from the freedesktop.org software repository at"
+- echo "***"
+- echo "*** http://www.freedesktop.org/software/pkgconfig"
+- echo "***"
+- exit 1
+- fi
++ echo "*** The pkg-config utility could not be found on your system."
++ echo "*** Make sure it is in your path, or set the PKG_CONFIG"
++ echo "*** environment variable to the full path to pkg-config."
++ echo "*** You can download pkg-config from the freedesktop.org"
++ echo "*** software repository at"
++ echo "***"
++ echo "*** http://www.freedesktop.org/software/pkgconfig"
++ echo "***"
++ exit 1
+ fi
+ ])
+
+
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2011-07-02 21:59:03 +0000
@@ -0,0 +1,1 @@
+proper-pkg-config-check
# Begin bundle
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
More information about the Pkg-xfce-devel
mailing list