dpkg-shlibdeps.pl: doesn't warn any more about libm.so.6 being unused

If the binary is also linked against libstdc++, the warning is suppressed
since g++ always add an implicit -lm.

diff --git a/ChangeLog b/ChangeLog
index b3fb14769748208889e900a3b9153277aea2e682..ff9e850775a91c2457c0ea93d51992f0927ee779 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-08  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/dpkg-shlibdeps.pl: Doesn't warn any more about libm.so.6
+       being unused if the binary is also linked against libstdc++ since
+       g++ always add an implicit -lm.
+
 2007-12-08  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Shlibs.pm (find_library): When it finds a library

diff --git a/debian/changelog b/debian/changelog
index aa336b2d44aa285ec103b5f604a8cbfc4c722c46..54d55a371039cb1ba86c3bcf84415cdf53462c66 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ dpkg (1.14.13) UNRELEASED; urgency=low
   * When dpkg-shlibdeps finds a lib in a directory which is just a symlink to
     another directory that is also considered, remember the other directory
     name as the canonical one. Closes: #453885
+  * dpkg-shlibdeps doesn't warn any more about libm.so.6 being unused if the
+    binary is also linked against libstdc++ since g++ always add an implicit
+    -lm. Closes: #454616
 
   [ Updated man pages translations ]
   * Swedish (Peter Karlsson)

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index ad88e7e35b17cadb29a41a51834389a8e71393e1..c26b7a3b325c741173f8816b738d000e12f97454 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -255,6 +255,9 @@ foreach my $file (keys %exec) {
     # Warn about un-NEEDED libraries
     foreach my $soname (@sonames) {
        unless ($soname_notfound{$soname} or $used_sonames{$soname}) {
+           # Ignore warning for libm.so.6 if also linked against libstdc++
+           next if ($soname =~ /^libm\.so\.\d+$/ and
+                    scalar grep(/^libstdc\+\+\.so\.\d+/, @sonames));
            warning(_g("%s shouldn't be linked with %s (it uses none of its " .
                       "symbols)."), $file, $soname);
        }