r454: * dh_makeshlibs: don't follow links to .so files. Instead, we will look

[debhelper.git] / dh_makeshlibs

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 9d48cd8b82b0030099a826876f338eab3ba61362..e80066887583a6a4370413cf52353f29884675b2 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -27,8 +27,10 @@ DH_COMPAT=3 mode and above only).
 
 =item B<-m>I<major>, B<--major=>I<major>
 
-Instead of trying to guess the major number of the library from the
-filename of the library, use the major number specified after the -m parameter.
+Instead of trying to guess the major number of the library with objdump,
+use the major number specified after the -m parameter. This is much less
+useful than it used to be, back in the bad old days when this program
+looked at library filenames rather than using objdump.
 
 =item B<-V>, B<-V>I<dependancies>
 
@@ -68,16 +70,6 @@ file that looks something like:
 Generates a shlibs file that looks something like:
   libfoobar 1 libfoobar1 (>= 1.0)
 
-=back
-
-=head1 NOTES
-
-There is no guarantee that the program will get the shlibs file right. For
-example, it may not correctly guess the major number of your package. In
-cases like these (and perhaps in general, just to be safe), it is better to
-create a debian/shlibs file by hand, or force it to use the correct major
-number by specifying the -m parameter.
-
 =cut
 
 init();
@@ -90,22 +82,22 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
        doit("rm", "-f", "$tmp/DEBIAN/shlibs");
 
-       open (FIND, "find $tmp -xtype f -name '*.so*' |");
+       # So, we look for files or links to existing files with names that
+       # match "*.so*". Matching *.so.* is not good enough because of
+       # broken crap like db3. And we only look at real files not
+       # symlinks, so we don't accidentually add shlibs data to -dev
+       # packages. This may have a few false positives, which is ok,
+       # because only if we can get a library name and a major number from
+       # objdump is anything actually added.
+       open (FIND, "find $tmp -type f -name '*.so*' |");
        while (<FIND>) {
-               my $library;
-               my $major;
-       
-               chomp;
-               $need_ldconfig=1;
-               # The second evil regexp is for db3, whose author should
-               # be shot.
-               if (m#.*/([^/]*)\.so\.(\d*)\.?# || m#.*/([^/]*)-([^\s/]+)\.so$#) {
-                       $library = $1;
-                       $major = $2;
-               }
+               my ($library, $major) = 
+                       `objdump -p $_` =~ m/\s+SONAME\s+(.+)\.so\.(.+)/;
+
                if (defined($dh{M_PARAMS}) && $dh{M_PARAMS} ne '') {
                        $major=$dh{M_PARAMS};
                }
+               
                if (! -d "$tmp/DEBIAN") {
                        doit("install","-d","$tmp/DEBIAN");
                }
@@ -123,6 +115,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                if (defined($library) && defined($major) && defined($deps) &&
                    $library ne '' && $major ne '' && $deps ne '') {
+                       $need_ldconfig=1;
                        # Prevent duplicate lines from entering the file.
                        my $line="$library $major $deps";
                        if (! $seen{$line}) {