Browse Source

Dpkg::Shlibs: Remove ancient multilib paths

The /emul/ia32-linux/lib and /emul/ia32-linux/usr/lib paths, inherited
from ia64, have long been unused, since Debian squeeze. It's about time
to get rid of them.
Guillem Jover 11 years ago
parent
commit
37b7e396be
2 changed files with 2 additions and 2 deletions
  1. 1 0
      debian/changelog
  2. 1 2
      scripts/Dpkg/Shlibs.pm

+ 1 - 0
debian/changelog

@@ -75,6 +75,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     URL instead. Closes: #784966
   * Cleanup default dpkg-shlibdeps shared library directory search list:
     - Do not add cross-root directories (/<triplet>/ and /usr/<triplet>/).
+    - Remove ancient multilib /emul/ia32-linux/ paths.
 
   * Perl modules:
     - Rename and deprecate Dpkg::Gettext _g function with new g_.

+ 1 - 2
scripts/Dpkg/Shlibs.pm

@@ -43,8 +43,7 @@ use constant DEFAULT_LIBRARY_PATH =>
     qw(/lib /usr/lib);
 # XXX: Deprecated multilib paths.
 use constant DEFAULT_MULTILIB_PATH =>
-    qw(/lib32 /usr/lib32 /lib64 /usr/lib64
-       /emul/ia32-linux/lib /emul/ia32-linux/usr/lib);
+    qw(/lib32 /usr/lib32 /lib64 /usr/lib64);
 
 my @librarypaths;
 my $librarypaths_init;