From: Raphael Hertzog <hertzog@debian.org>
Date: Sun, 25 Nov 2007 17:06:30 +0000 (+0000)
Subject: Dpkg::Shlibs::find_library() now returns canonicalized paths
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11c7b74d8ee2b25514a20bd2833f920d3aed2c86;p=dpkg

Dpkg::Shlibs::find_library() now returns canonicalized paths
---

diff --git a/ChangeLog b/ChangeLog
index 783dad8e..18a74b39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* scripts/dpkg-gensymbols.pl: Add a new -I<file> option to force
 	the usage of a specific file as basis for the generated symbols
 	file.
+	* scripts/Dpkg/Shlibs.pm (find_library): Canonicalize paths before
+	returning them as bad RPATH can lead to non-canonical paths
+	causing us troubles in dpkg-shlibdeps.
 
 2007-11-24  Guillem Jover  <guillem@debian.org>
 
diff --git a/debian/changelog b/debian/changelog
index e71a9616..edaabd24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.14.12) UNRELEASED; urgency=low
 
-  *
+  [ Raphael Hertzog ]
+  * Dpkg::Shlibs::find_library() now returns canonicalized paths.
 
  -- Guillem Jover <guillem@debian.org>  Sat, 24 Nov 2007 07:38:13 +0200
 
diff --git a/scripts/Dpkg/Shlibs.pm b/scripts/Dpkg/Shlibs.pm
index 03916bb5..247ddcff 100644
--- a/scripts/Dpkg/Shlibs.pm
+++ b/scripts/Dpkg/Shlibs.pm
@@ -22,6 +22,8 @@ use warnings;
 use base qw(Exporter);
 our @EXPORT_OK = qw(@librarypaths find_library);
 
+use File::Spec;
+
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling qw(syserr);
 use Dpkg::Shlibs::Objdump;
@@ -78,7 +80,7 @@ sub find_library {
 	if (-e "$root$dir/$lib") {
 	    my $libformat = Dpkg::Shlibs::Objdump::get_format("$root$dir/$lib");
 	    if ($format eq $libformat) {
-		return "$root$dir/$lib";
+		return File::Spec->canonpath("$root$dir/$lib");
 	    }
 	}
     }