The branch, dpkg-shlibdeps-buxy has been updated
via 05c04ffc005ce29a4017a8e8c48389cca0911ed1 (commit)
from 2c9ec8dcf5a6e58d92750a8ae19d202f86aa868d (commit)
- Shortlog ------------------------------------------------------------
05c04ff dpkg-shlibdeps: look into package directories before the root filesytem
Summary of changes:
scripts/dpkg-shlibdeps.pl | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 05c04ffc005ce29a4017a8e8c48389cca0911ed1
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Wed Sep 26 11:45:04 2007 +0200
dpkg-shlibdeps: look into package directories before the root filesytem
When dpkg-shlibdeps tries to find a library, it will scan
the same directories as ld.so but at various "virtual root" (the real root
and also the root of the build trees). The root of the built
packages should have precedence otherwise we might analyze outdated
files which are installed in the root filesystem and which would
be replaced by the package being built.
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 5f43586..cc18853 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -414,8 +414,7 @@ sub symfile_has_soname {
# find_library ($soname, [EMAIL PROTECTED], $format)
sub my_find_library {
my ($lib, $rpath, $format) = @_;
- my $file = find_library($lib, $rpath, $format, "");
- return $file if defined($file);
+ my $file;
# Look into the packages we're currently building (but only those
# that provides shlibs file...)
@@ -425,6 +424,12 @@ sub my_find_library {
$file = find_library($lib, $rpath, $format, $builddir);
return $file if defined($file);
}
+
+ # Fallback in the root directory if we have not found what we were
+ # looking for in the packages
+ $file = find_library($lib, $rpath, $format, "");
+ return $file if defined($file);
+
return undef;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
