Quellcode durchsuchen

Dpkg::Shlibs: Detangle deprecated multilib paths into their own variables

This will allow in the future to hide these by default and avoid
polluting the default paths.
Guillem Jover vor 11 Jahren
Ursprung
Commit
0a297195aa
1 geänderte Dateien mit 6 neuen und 2 gelöschten Zeilen
  1. 6 2
      scripts/Dpkg/Shlibs.pm

+ 6 - 2
scripts/Dpkg/Shlibs.pm

@@ -35,7 +35,10 @@ use Dpkg::Arch qw(debarch_to_gnutriplet get_build_arch get_host_arch
                   gnutriplet_to_multiarch debarch_to_multiarch);
                   gnutriplet_to_multiarch debarch_to_multiarch);
 
 
 use constant DEFAULT_LIBRARY_PATH =>
 use constant DEFAULT_LIBRARY_PATH =>
-    qw(/lib /usr/lib /lib32 /usr/lib32 /lib64 /usr/lib64
+    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);
        /emul/ia32-linux/lib /emul/ia32-linux/usr/lib);
 
 
 my @librarypaths;
 my @librarypaths;
@@ -99,7 +102,8 @@ sub setup_library_paths {
              "/$crossprefix/lib64", "/usr/$crossprefix/lib64";
              "/$crossprefix/lib64", "/usr/$crossprefix/lib64";
     }
     }
 
 
-    @librarypaths = (DEFAULT_LIBRARY_PATH, @crosslibrarypaths);
+    @librarypaths = (DEFAULT_LIBRARY_PATH, DEFAULT_MULTILIB_PATH,
+                     @crosslibrarypaths);
 
 
     # XXX: Deprecated. Update library paths with LD_LIBRARY_PATH.
     # XXX: Deprecated. Update library paths with LD_LIBRARY_PATH.
     if ($ENV{LD_LIBRARY_PATH}) {
     if ($ENV{LD_LIBRARY_PATH}) {