Package: pkg-config
Version: 0.28-1
Severity: normal
Tags: patch

Dear maintainer,

In Ubuntu, we regularly cross-build a lot of packages, which does rely
on cross-building against non-multiarched libraries. All builds are
done in clean chroots & this has not raised an issue before.

Regards,

Dimitri.

diff -u pkg-config-0.28/debian/changelog pkg-config-0.28/debian/changelog
--- pkg-config-0.28/debian/changelog
+++ pkg-config-0.28/debian/changelog
@@ -1,3 +1,12 @@
+pkg-config (0.28-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * On Ubuntu, in pkg-config-crosswrapper add /usr/lib/pkgconfig to
+    PKG_CONFIG_LIBDIR. As a lot of packages that are cross-build on
+    regular basis rely on cross-building with non-multiarched libraries.
+
+ -- Dimitri John Ledkov <x...@ubuntu.com>  Fri, 23 May 2014 12:46:55 +0100
+
 pkg-config (0.28-1) unstable; urgency=medium
 
   * New upstream release.  (Closes: #699476, #744031)
diff -u pkg-config-0.28/debian/control pkg-config-0.28/debian/control
--- pkg-config-0.28/debian/control
+++ pkg-config-0.28/debian/control
@@ -9,7 +9,7 @@
 Package: pkg-config
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg-dev
 Description: manage compile and link flags for libraries
  pkg-config is a system for managing library compile and link flags that 
  works with automake and autoconf.
diff -u pkg-config-0.28/debian/pkg-config-crosswrapper 
pkg-config-0.28/debian/pkg-config-crosswrapper
--- pkg-config-0.28/debian/pkg-config-crosswrapper
+++ pkg-config-0.28/debian/pkg-config-crosswrapper
@@ -28,7 +28,11 @@
   # If you want to allow use of un-multiarched -dev packages for crossing 
   # (at the risk of finding build-arch stuff you didn't want, if not in a 
clean chroot)
   # Uncomment the next line:
-  # PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/lib/pkgconfig" 
+  # PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/lib/pkgconfig"
+  # ... but on Ubuntu we rely cross-building with non-multiarch libraries:
+  if dpkg-vendor --derives-from Ubuntu; then
+      PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/lib/pkgconfig"
+  fi
   PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/share/pkgconfig"
 
   export PKG_CONFIG_LIBDIR


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to