* dh_shlibdeps: Update documentation for -L and -l. dpkg-shlibdeps is now

[debhelper.git] / dh_shlibdeps

diff --git a/dh_shlibdeps b/dh_shlibdeps
index 3fae6a6660bd22570254cead4013090c1a8f2553..cfbfa2def78ae84687f5c8723b380b1f392ec91b 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_shlibdeps - calculate shared library dependancies
+dh_shlibdeps - calculate shared library dependencies
 
 =cut
 
@@ -17,7 +17,7 @@ B<dh_shlibdeps> [S<I<debhelper options>>] [B<-L>I<package>] [B<-l>I<directory>]
 =head1 DESCRIPTION
 
 dh_shlibdeps is a debhelper program that is responsible for calculating
-shared library dependancies for packages.
+shared library dependencies for packages.
 
 This program is merely a wrapper around L<dpkg-shlibdeps(1)> that calls it
 once for each package listed in the control file, passing it
@@ -36,29 +36,29 @@ Pass "params" to L<dpkg-shlibdeps(1)>.
 =item B<-X>I<item>, B<--exclude=>I<item>
 
 Exclude files that contain "item" anywhere in their filename from being
-passed to dpkg-shlibdeps. This will make their dependancies be ignored.
+passed to dpkg-shlibdeps. This will make their dependencies be ignored.
 This may be useful in some situations, but use it with caution. This option
 may be used more than once to exclude more than one thing.
 
 =item B<-l>I<directory>[:directory:directory:..]
 
-Before dpkg-shlibdeps is run, LD_LIBRARY_PATH will have added to it the 
-specified directory (or directories -- separate with colons). This is
-useful for multi-binary packages where a library is built in one
-package and another package contains binaries linked against said
-library. Relative paths will be made absolute for the benefit of
-dpkg-shlibdeps.
+With recent versions of dpkg-shlibdeps, this option is generally not
+needed.
 
-Note that the directory given should be the complete or relative path to
-a directory that contains the library. See example below.
+Before dpkg-shlibdeps is run, LD_LIBRARY_PATH will have added to it the 
+specified directory (or directories -- separate with colons). With recent
+versions of dpkg-shlibdeps, this is mostly only useful for packages that
+build multiple flavors of the same library, or other situations where
+the library is installed into a directory not on the regular library search
+path.
 
 =item B<-L>I<package>, B<--libpackage=>I<package>
 
-Use the shlibs file automatically generated by dh_makeshlibs for the named
-package as a kind of automatically generated shlibs.local file. You can us
-this switch in concert with the -l switch to make dpkg-shlibdeps find a
-library built as part of the current package, and get the shlibs information.
-See example below.
+With recent versions of dpkg-shlibdeps, this option is generally not
+needed.
+
+Tell dpkg-shlibdeps to use the shlibs file automatically generated by
+dh_makeshlibs for the named package instead of the shlibs.local file.
 
 =back
 
@@ -69,7 +69,7 @@ libfoo-bin binary packages. libfoo-bin links against libfoo1, and should
 depend on it. In your rules file, first run dh_makeshlibs, then dh_shlibdeps:
 
        dh_makeshlibs
-       dh_shlibdeps -L libfoo1 -l debian/libfoo1/usr/lib
+       dh_shlibdeps
 
 This will have the effect of generating automatically a shlibs file for
 libfoo1, and using that file and the libfoo1 library in the
@@ -80,7 +80,6 @@ information.
 
 init();
 
-# Add directory to library search path.
 if ($dh{L_PARAMS}) {
        my @paths=();
        # Add to existing paths, if set.
@@ -92,12 +91,10 @@ if ($dh{L_PARAMS}) {
                        push @paths, $_;
                }
                else {
-                       push @paths, getcwd()."/$_";
+                       push @paths, "/$_";
                }
        }
        $dh{L_PARAMS}=join(':', @paths);
-       $ENV{'LD_LIBRARY_PATH'}=$dh{L_PARAMS};
-       verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS}");
 }
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
@@ -113,7 +110,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
                $find_options="! \\( $dh{EXCLUDE_FIND} \\)";
        }
-       foreach my $file (split(/\n/,`find $tmp -type f \\( -perm +111 -or -name "*.so*" \\) $find_options`)) {
+       foreach my $file (split(/\n/,`find $tmp -path $tmp/usr/lib/debug -prune -or -type f \\( -perm +111 -or -name "*.so*" \\) $find_options -print`)) {
                # TODO this is slow, optimize. Ie, file can run once on
                # multiple files..
                $ff=`file "$file"`;
@@ -127,14 +124,32 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if (defined $dh{LIBPACKAGE} && length $dh{LIBPACKAGE}) {
                        @opts=("-L".tmpdir($dh{LIBPACKAGE}."/DEBIAN/shlibs"));
                }
+               
+               push @opts, "-tudeb" if is_udeb($package);
+               
+               my $ld_library_path_orig=$ENV{LD_LIBRARY_PATH};
+               if ($dh{L_PARAMS}) {
+                       $ENV{LD_LIBRARY_PATH}=$dh{L_PARAMS};
+                       verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS}");
+               }
+               
                doit("dpkg-shlibdeps","-Tdebian/${ext}substvars",
                        @opts,@{$dh{U_PARAMS}},@filelist);
+
+               if ($dh{L_PARAMS}) {
+                       if (defined $ld_library_path_orig) {
+                               $ENV{LD_LIBRARY_PATH}=$ld_library_path_orig;
+                       }
+                       else {
+                               delete $ENV{LD_LIBRARY_PATH};
+                       }
+               }
        }
 }
 
 =head1 SEE ALSO
 
-L<debhelper(7)>
+L<debhelper(7)>, L<dpkg-shlibdeps(1)>
 
 This program is a part of debhelper.