diff options
author | Pino Toscano <pino@debian.org> | 2016-08-27 09:45:54 +0200 |
---|---|---|
committer | Pino Toscano <pino@debian.org> | 2016-08-27 09:45:54 +0200 |
commit | 92f63673170d6f230e78c9f9f862099704821db7 (patch) | |
tree | 339ca576cb08a389e24736ec886cdbc85a8713eb /dh_sodeps | |
parent | bdfe338e4a2c917121799e6b56dce82f13f083e3 (diff) | |
download | pkg-kde-tools-92f63673170d6f230e78c9f9f862099704821db7.tar.gz |
dh_sodeps: work also for libs in multiarch dir
Diffstat (limited to 'dh_sodeps')
-rwxr-xr-x | dh_sodeps | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -73,7 +73,12 @@ my @packages = getpackages("arch"); foreach my $package (@{$dh{DOPACKAGES}}) { my $tmpdir = tmpdir($package); - my @solinks = grep { -l $_ } glob("$tmpdir/usr/lib/*.so"); + my $globstring = "$tmpdir/usr/lib/*.so"; + my $multiarch = dpkg_architecture_value("DEB_HOST_MULTIARCH"); + if (defined $multiarch) { + $globstring = "$globstring $tmpdir/usr/lib/$multiarch/*.so" + } + my @solinks = grep { -l $_ } glob($globstring); if (@solinks) { my $arch = package_arch($package); @@ -93,7 +98,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $target = readlink($solink); foreach my $p (@packages) { next if $p eq $package; - if (-e "debian/$p/usr/lib/$target") { + if (-e "debian/$p/usr/lib/$target" || (defined $multiarch and -e "debian/$p/usr/lib/$multiarch/$target")) { addsubstvar($package, "so:Depends", $p, $verinfo); } } |