The following commit has been merged in the master branch:
commit fc39dea9ec2ed9528f39eb288e94932913f70bf8
Author: Guillem Jover <[email protected]>
Date: Thu Feb 25 05:58:01 2010 +0100
dpkg-buildpackage: Do not set PKG_CONFIG_LIBDIR when cross-building
The proper solution to this is to let the build system choose the
appropriate pkg-config binary for the build or host system in the
same way pkg.m4 is handling it now.
Closes: #551118
diff --git a/debian/changelog b/debian/changelog
index 56129c5..3da5ca1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -120,6 +120,10 @@ dpkg (1.15.6) UNRELEASED; urgency=low
Thanks to Jonathan Nieder for the initial patch.
* Use xz command to handle lzma compressed files in dpkg and dpkg-dev.
This removes the lzma package from both dpkg and dpkg-dev dependencies.
+ * Do not set PKG_CONFIG_LIBDIR in dpkg-buildpackage when cross-building.
+ The proper solution to this is to let the build system choose the
+ appropriate pkg-config binary for the build or host system in the same
+ way pkg.m4 is handling it now. Closes: #551118
[ Modestas Vainius ]
* Implement symbol patterns (Closes: #563752). From now on, it is possible to
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 5230da1..e2f0c75 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -29,7 +29,6 @@ use Dpkg::BuildOptions;
use Dpkg::Compression;
use Dpkg::Version;
use Dpkg::Changelog::Parse;
-use Dpkg::Arch qw(get_build_arch debarch_to_gnutriplet);
textdomain("dpkg-dev");
@@ -322,16 +321,6 @@ while ($_ = <$arch_env>) {
}
close $arch_env or subprocerr('dpkg-architecture');
-# In case of cross-compilation, give sensible default search path
-# for some widely used tools
-$targetgnusystem = debarch_to_gnutriplet($targetarch) if $targetarch;
-if ($targetgnusystem and
- ($targetgnusystem ne debarch_to_gnutriplet(get_build_arch())))
-{
- $ENV{PKG_CONFIG_LIBDIR} ||= "/usr/$targetgnusystem/lib/pkgconfig/:" .
- "/usr/share/pkgconfig/";
-}
-
my $arch;
unless ($sourceonly) {
$arch = mustsetvar($ENV{'DEB_HOST_ARCH'}, _g('host architecture'));
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
