Package: pkg-config
Followup-For: Bug #631275
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi Tollef, Samuel,
Samuel, the current pkg-config package already provides everything needed in
order to correctly set the pkg-config search path: pkg.m4 uses
AC_PATH_TOOL(), which will look for a $host-pkg-config when cross compiling.
So you need only make $host-pkg-config available on your path, and this is
easy enough to do because /usr/share/pkg-config-crosswrapper is an
implementation of just such a wrapper, requiring you to add only a symlink.
However, there is a bug in the current implementation, in that it only sets
PKG_CONFIG_LIBDIR to a single directory where for transitional purposes we
want it to set PKG_CONFIG_PATH to include both the multiarch directory
(preferred) and the typical cross-compiler directory.
The attached patch implements this, and also sets pkg-control as Multi-Arch:
foreign, since it should be safe to assume that the native version of
pkg-config installed by default is the one we want except in the case of a
cross-build where we want to invoke it under a different name.
I am uploading this change to Ubuntu with the following changelog:
* debian/pkg-config-crosswrapper: fix to use PKG_CONFIG_PATH pointed to
both the multiarch path and the traditional cross-build path, instead of
just settting PKG_CONFIG_LIBDIR to the traditional cross-compiler path,
so that we can use this successfully in a multiarch environment.
Closes: #631275.
* debian/control: mark pkg-config Multi-Arch: allowed; it provides an
executable interface which points to architecture-dependent paths, but
those paths only need to be overridden in a cross-build environment, in
which case it's the responsibility of the cross-toolchain packages to
provide the appropriate glue.
You may want to do the same in Debian. Or, if you see any problems with
this patch, please let me know.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
[email protected] [email protected]
=== modified file 'debian/control'
--- debian/control 2011-05-15 14:37:09 +0000
+++ debian/control 2011-07-02 23:18:57 +0000
@@ -8,6 +8,7 @@
Package: pkg-config
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: manage compile and link flags for libraries
pkg-config is a system for managing library compile and link flags that
=== modified file 'debian/pkg-config-crosswrapper'
--- debian/pkg-config-crosswrapper 2011-05-15 14:37:09 +0000
+++ debian/pkg-config-crosswrapper 2011-07-02 23:18:28 +0000
@@ -3,4 +3,4 @@
# Sets pkg-config search path to target arch path only.
triplet=`basename $0 | sed -e 's:-pkg-config::'`
-PKG_CONFIG_LIBDIR=/usr/${triplet}/lib/pkgconfig pkg-config $@
+PKG_CONFIG_PATH=/usr/lib/${triplet}/pkgconfig:/usr/${triplet}/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
pkg-config $@
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [email protected]\
# b8z5g4pynb9nnjig
# target_branch: :parent
# testament_sha1: 02e492b75279cc422e8f2b98efa72f4e1c605b04
# timestamp: 2011-07-02 16:25:41 -0700
# base_revision_id: [email protected]\
# ux12zpmh5swnf3v0
#
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog 2011-05-15 14:37:09 +0000
+++ debian/changelog 2011-07-02 23:24:55 +0000
@@ -1,3 +1,18 @@
+pkg-config (0.26-1ubuntu1) oneiric; urgency=low
+
+ * debian/pkg-config-crosswrapper: fix to use PKG_CONFIG_PATH pointed to
+ the multiarch path, the traditional cross-build path, and both of
+ /usr/lib/pkgconfig and /usr/share/pkgconfig, instead of just settting
+ PKG_CONFIG_LIBDIR to the traditional cross-compiler path, so that we can
+ use this successfully in a multiarch environment. Closes: #631275.
+ * debian/control: mark pkg-config Multi-Arch: foreign; it provides an
+ executable interface which points to architecture-dependent paths, but
+ those paths only need to be overridden in a cross-build environment, in
+ which case it's the responsibility of the cross-toolchain packages to
+ provide the appropriate glue.
+
+ -- Steve Langasek <[email protected]> Sat, 02 Jul 2011 16:24:53 -0700
+
pkg-config (0.26-1) unstable; urgency=low
* New upstream release
=== modified file 'debian/control'
--- debian/control 2011-05-15 14:37:09 +0000
+++ debian/control 2011-07-02 23:23:43 +0000
@@ -8,6 +8,7 @@
Package: pkg-config
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: manage compile and link flags for libraries
pkg-config is a system for managing library compile and link flags that
=== modified file 'debian/pkg-config-crosswrapper'
--- debian/pkg-config-crosswrapper 2011-05-15 14:37:09 +0000
+++ debian/pkg-config-crosswrapper 2011-07-02 23:20:28 +0000
@@ -3,4 +3,4 @@
# Sets pkg-config search path to target arch path only.
triplet=`basename $0 | sed -e 's:-pkg-config::'`
-PKG_CONFIG_LIBDIR=/usr/${triplet}/lib/pkgconfig pkg-config $@
+PKG_CONFIG_PATH=/usr/lib/${triplet}/pkgconfig:/usr/${triplet}/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
pkg-config $@
# Begin bundle
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
ofOD9Wp/+LuSKcKEh1n6FcA=
