Browse Source

Support a colon separated list of paths from the ELF RPATH field in
dpkg-shlibdeps. Thanks to Jiří Paleček. Closes: #427988

Guillem Jover 17 years ago
parent
commit
5371b8082c
3 changed files with 8 additions and 1 deletions
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 1
      scripts/dpkg-shlibdeps.pl

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2007-06-12  Jiří Paleček  <jpalecek@web.de>
+
+	* dpkg-shlibdeps.pl: Support colon separated list of paths in the
+	ELF RPATH field.
+
 2007-06-12  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-scanpackages.pl: Move check for existence of $override

+ 2 - 0
debian/changelog

@@ -8,6 +8,8 @@ dpkg (1.14.5) UNRELEASED; urgency=low
     packages information. Closes: #428169, #428470
   * Add '.shelf' to the default dpkg-source -i regex. Closes: #427827
     Thanks to Adeodato Simó.
+  * Support a colon separated list of paths from the ELF RPATH field in
+    dpkg-shlibdeps. Thanks to Jiří Paleček. Closes: #427988
   * Man pages cleanup:
     - Reference deb-substvars(5) instead of dpkg-substvars(5).
     - Mark dpkg-* commands in bold.

+ 1 - 1
scripts/dpkg-shlibdeps.pl

@@ -209,7 +209,7 @@ for ($i=0;$i<=$#exec;$i++) {
 		warning(sprintf(_g("format of 'NEEDED %s' not recognized"), $1));
 	    }
 	} elsif (/^\s*RPATH\s+(\S+)\s*$/) {
-	    push @{$rpaths{$exec[$i]}}, $1;
+	    push @{$rpaths{$exec[$i]}}, split(/:/, $1);
 	}
     }
     close(P) or subprocerr(sprintf(_g("objdump on \`%s'"), $exec[$i]));