Hi!
On Sat, 2014-12-06 at 00:11:14 +0100, Helmut Grohne wrote:
> Package: libdpkg-perl
> Version: 1.17.22
> File: /usr/share/perl5/Dpkg/Shlibs.pm
> Tags: patch
> User: helm...@debian.org
> Usertags: rebootstrap
> I am
> therefore proposing the attached patch to change the library path order
> from:
>
> LD_LIBRARY_PATH > DEFAULT_LIBRARY_PATH > crosslibrarypaths > ld.so.conf
>
> to:
>
> LD_LIBRARY_PATH > non multilib part of DEFAULT_LIBRARY_PATH > ld.so.conf >
> multilib part of DEFAULT_LIBRARY_PATH > crosslibrarypaths
Yeah, looks good.
> After applying this patch, libc6 is preferred over libc6-amd64 by
> dpkg-shlibdeps.
> diff -Nru dpkg-1.17.22/scripts/Dpkg/Shlibs.pm
> dpkg-1.17.22+nmu1/scripts/Dpkg/Shlibs.pm
> --- dpkg-1.17.22/scripts/Dpkg/Shlibs.pm
> +++ dpkg-1.17.22+nmu1/scripts/Dpkg/Shlibs.pm
> @@ -36,7 +36,9 @@
> gnutriplet_to_multiarch debarch_to_multiarch);
>
> use constant DEFAULT_LIBRARY_PATH =>
> - qw(/lib /usr/lib /lib32 /usr/lib32 /lib64 /usr/lib64
> + qw(/lib /usr/lib);
> +use constant DEFAULT_MULTILIB_PATH =>
> + qw(/lib32 /usr/lib32 /lib64 /usr/lib64
> /emul/ia32-linux/lib /emul/ia32-linux/usr/lib);
>
> # Adjust set of directories to consider when we're in a situation of a
> @@ -67,7 +69,7 @@
> "/$crossprefix/lib64", "/usr/$crossprefix/lib64";
> }
>
> -my @librarypaths = (DEFAULT_LIBRARY_PATH, @crosslibrarypaths);
> +my @librarypaths = (DEFAULT_LIBRARY_PATH);
>
> # XXX: Deprecated. Update library paths with LD_LIBRARY_PATH
> if ($ENV{LD_LIBRARY_PATH}) {
> @@ -80,6 +82,9 @@
> # Update library paths with ld.so config
> parse_ldso_conf('/etc/ld.so.conf') if -e '/etc/ld.so.conf';
>
> +push @librarypaths, DEFAULT_MULTILIB_PATH;
> +push @librarypaths, @crosslibrarypaths;
I already had a hunk exactly like the first one splitting the multilib
paths to prepare the way for its deprecation. I've fixed the conflicts
and merged this in my branch for 1.18.x, which I hope to push next
week or so.
Thanks,
Guillem
--
To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
