--- Begin Message ---
Source: dpkg-cross
Version: 2.6.11
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
dpkg-cross assumes that DEB_HOST_GNU_TYPE == DEB_HOST_MULTIARCH. Thus it
queries for the former and then uses that triplet to look for libraries
in /usr/lib. Unfortunately for i386 this assumption is violated. Thus
i386 packages end up being emptied.
I am attaching a patch that adds the distinction and produces reasonable
packages when operating on i386. This patch is crafted in a way that it
even applies after applying #771497 and #772045 (extra hunk header).
Helmut
diff -Nru dpkg-cross-2.6.11/debian/changelog dpkg-cross-2.6.11+nmu1/debian/changelog
--- dpkg-cross-2.6.11/debian/changelog 2013-05-24 21:28:56.000000000 +0200
+++ dpkg-cross-2.6.11+nmu1/debian/changelog 2014-12-15 10:48:28.000000000 +0100
@@ -1,3 +1,11 @@
+dpkg-cross (2.6.11+nmu1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * DEB_HOST_GNU_TYPE and DEB_HOST_MULTIARCH are not necessarily equal.
+ (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Mon, 15 Dec 2014 10:47:58 +0100
+
dpkg-cross (2.6.11) unstable; urgency=low
* Upload changes from experimental to unstable.
diff -Nru dpkg-cross-2.6.11/dpkg-cross dpkg-cross-2.6.11+nmu1/dpkg-cross
--- dpkg-cross-2.6.11/dpkg-cross 2013-05-24 21:28:22.000000000 +0200
+++ dpkg-cross-2.6.11+nmu1/dpkg-cross 2014-12-15 10:41:35.000000000 +0100
@@ -14,7 +14,8 @@
@keepdeps $dpkg_statfile $progname $debname $anyway $cross2cross $crosstype
$crossdir $crosslib $crosslib64 $crosslib32 $crossinc $data $len
$retval $dpkg_cmd $mode $pkg @exlist $conffile $removedeps $keepdeps
-$DPKGCROSSVERSION $keep_temp $msg $multiarchpackage $multiarch $multiarchconv);
+$DPKGCROSSVERSION $keep_temp $msg $multiarchpackage $multiarch
+$multiarchtriplet $multiarchconv);
setlocale(LC_MESSAGES, "");
textdomain("dpkg-cross");
@@ -723,6 +724,8 @@
my $config = &get_config;
$crosstype = `CC="" dpkg-architecture -f -a$arch -qDEB_HOST_GNU_TYPE 2> /dev/null`;
chomp ($crosstype);
+ $multiarchtriplet = `CC="" dpkg-architecture -f -a$arch -qDEB_HOST_MULTIARCH 2> /dev/null`;
+ chomp ($multiarchtriplet);
$crossinc = $$config{'crossinc'};
$crossdir = $$config{'crossdir'};
$crosslib = $$config{'crosslib'};
@@ -729,7 +732,7 @@
$crosslib64 = $$config{'crosslib64'};
$crosslib32 = $$config{'crosslib32'};
# add extra regexp component for multiarch packages
- if ($multiarchpackage) { $multiarch="\Q$crosstype/\E" } else {$multiarch=""};
+ if ($multiarchpackage) { $multiarch="\Q$multiarchtriplet/\E" } else {$multiarch=""};
# Now process regular files ...
open(PIPE, "find $src/ -type f -print |") or goto fail;
@@ -738,8 +741,8 @@
s/^$src//;
/^DEBIAN/ && next;
# if we have library files on multiarch paths, treat deb like a multiarch package
- if (m:^(/usr)?/lib/\Q$crosstype/\E:) {
- $multiarch="\Q$crosstype/\E"
+ if (m:^(/usr)?/lib/\Q$multiarchtriplet/\E:) {
+ $multiarch="\Q$multiarchtriplet/\E"
}
# special support for generated cache data
if (m:(/etc/dpkg-cross/cross-config.d/($arch)?/.*):) {
--- End Message ---
--- Begin Message ---
Source: dpkg-cross
Source-Version: 2.6.13
We believe that the bug you reported is fixed in the latest version of
dpkg-cross, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 773266@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Wookey <wookey@debian.org> (supplier of updated dpkg-cross package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 23 Jan 2015 16:02:07 +0000
Source: dpkg-cross
Binary: dpkg-cross libdebian-dpkgcross-perl
Architecture: source all
Version: 2.6.13
Distribution: experimental
Urgency: medium
Maintainer: Debian Embedded Group <debian-embedded@lists.debian.org>
Changed-By: Wookey <wookey@debian.org>
Description:
dpkg-cross - tools for cross compiling Debian packages
libdebian-dpkgcross-perl - functions to aid cross-compiling Debian packages
Closes: 773266
Changes:
dpkg-cross (2.6.13) experimental; urgency=medium
.
* Fix behaviour where DEB_HOST_GNU_TYPE != DEB_HOST_MULTIARCH (e.g. i386)
(Closes: 773266)
* Merge Ubuntu dpkg-cross fixes:
Handle datarootdir specially in .pc files: keep the original prefix
Assume multiarch if encoutering a /usr/include/$crosstype/ file too.
This fixes issues with arch-qualified include files being moved
to doubly-qualified paths.
Handle lines containing '${exec_prefix}/bin' specially in .pc files;
these are normally development tools, so should keep the original
(build arch) prefix. (For example, orbit_idl in ORBit-2.0.pc.)
Checksums-Sha1:
09547beba497ebbf971306a87b12c5fe85243780 1783 dpkg-cross_2.6.13.dsc
f2a44faa843745c99a58c643679d8728695dffbd 80897 dpkg-cross_2.6.13.tar.gz
257981544190699b516626fbc1f37cd9b8a8a529 54586 dpkg-cross_2.6.13_all.deb
12cee504b9d6964f0cf4cbd94233655906188b97 29396 libdebian-dpkgcross-perl_2.6.13_all.deb
Checksums-Sha256:
37ea5d827e8cebf2ff9135303ebf70197e7f17dc50f280a3e7a5f11dc018d3c1 1783 dpkg-cross_2.6.13.dsc
dd90403344a58d054dc12b86f419ee6b8c0f5d6f651368e4e80384bce8d0398e 80897 dpkg-cross_2.6.13.tar.gz
108c13dc5cd8aa255c33a08ebc3f94a9cd293ed52f3c4eed42c85836e9983437 54586 dpkg-cross_2.6.13_all.deb
7071060e2cd2a366ddec60fa039674dd7d7362de3cd40739cafa760a73ea7e24 29396 libdebian-dpkgcross-perl_2.6.13_all.deb
Files:
7f343b2e11a5b67eb00ab249dfe9626d 1783 utils extra dpkg-cross_2.6.13.dsc
5da82f68153600df16bf4a1975eaea82 80897 utils extra dpkg-cross_2.6.13.tar.gz
19b2bb5b7fa62971351f8f9899b36471 54586 utils extra dpkg-cross_2.6.13_all.deb
1da99ec4f9dd2f6f837d293309f68978 29396 perl extra libdebian-dpkgcross-perl_2.6.13_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJUx73EAAoJEPuGMlGob55HvYYP/3FnERkB/7IWJtPP34/Ot6Zd
YyARirL7JUko8YtKxEridVr2hrKympcceQqHKbNpmsHQH+DbUUBWlLw1uvxMkD2A
w0IBC9ZQtMb61D1xjZkyAZft1ipptytvV8PROK5azrVzD2edH1pg9wsTI5czMV3w
yd1k+46Avzq725aq3UGdMHwDyRuSzBeGLlh8vr5H5p4XbVdCA21aCTZDjq3GfTHP
7cjF2UaIyNACHgp8je/Qw+riOvKyTSbM4lIK4pZp1Qc16K+4frvM/gEbGc3opDQ/
92emZ79aJPnsS0NVd4Suyr78C2U5IsqQWvCl4U757BsDjbSKVGZU4lUQpGdzb4YE
vmtaarIMSrJLHwhVON9wht4ejSFlTElldM51HPgyn5/f3SvTGwzgiRKd6y0Vw3qj
Oa80W16qJgMHoCZROmRXKho8EDYL7Nh6cjwuLdWstlTeCXsQ5uqvpN8C6LBM0eev
MPZj/SB6hzWV5NyV2dPii4kJxleC0mlznAKs/UZWoDPInA8IRV5Cm44fmL/Qmoth
BhbICgTlJNEDFdau1qMLCkiIMzsqGapLSbW9uhq5NKWOCm3JcVuH3R7eN8UBYYvO
cOYw9ExOMacuxq8qnRLsqMJKObrbvrXb+VNjZW/fZnKIi/S+xKm6L26ZwgtqV20a
kIaki47AKPgEnY9PFCXj
=85GL
-----END PGP SIGNATURE-----
--- End Message ---