Dpkg::Shlibs: Prefer multiarch paths to multilib ones

Match the ld.so path resolution logic, by preferring multiarch paths
over multilib or cross paths.

[guillem@debian.org:
 - Adapt to current code. ]

Closes: #772184
Signed-off-by: Guillem Jover <guillem@debian.org>

debian/changelog

@@ -30,6 +30,8 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     libdpkg-perl Depends on dpkg to 1.16.3, the version introducing the file.
   * Remove support for GCC_TARGET environment variable from Dpkg::Shlibs.
     This was a temporary workaround for very old gcc toolchains. See #453267.
+  * Prefer multiarch paths to multilib ones in Dpkg::Shlibs.
+    Thanks to Helmut Grohne <helmut@subdivi.de>. Closes: #772184
 
  -- Guillem Jover <guillem@debian.org>  Tue, 09 Dec 2014 23:53:18 +0100
 

scripts/Dpkg/Shlibs.pm

@@ -79,6 +79,9 @@ sub blank_library_paths {
 sub setup_library_paths {
     @librarypaths = DEFAULT_LIBRARY_PATH;
 
+    # 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;
 
     # Adjust set of directories to consider when we're in a situation of a
@@ -117,9 +120,6 @@ sub setup_library_paths {
         }
     }
 
-    # Update library paths with ld.so config.
-    parse_ldso_conf('/etc/ld.so.conf') if -e '/etc/ld.so.conf';
-
     $librarypaths_init = 1;
 }