r468: * dh_shlibdeps: the -l switch now just adds to LD_LIBRARY_PATH, if it is

     already set. Newer fakeroots set it, and clobbering their settings
     breaks things since they LD_PRELOAD a library that is specified in the
     LD_LIBRARY_PATH. (blah) Closes: #97494

diff --git a/debian/changelog b/debian/changelog
index 0158f610a7583f1e5c2f8c2d5eb2944f85dd3295..2d6115fb76ee4dd5679f2afa58092a4e6a4678e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (3.0.23) unstable; urgency=low
+
+  * dh_shlibdeps: the -l switch now just adds to LD_LIBRARY_PATH, if it is
+    already set. Newer fakeroots set it, and clobbering their settings 
+    breaks things since they LD_PRELOAD a library that is specified in the
+    LD_LIBRARY_PATH. (blah) Closes: #97494
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 14 May 2001 22:32:23 -0400
+
 debhelper (3.0.22) unstable; urgency=low
 
   * dh_installinfo: doc enchancement, Closes: #97515

diff --git a/dh_shlibdeps b/dh_shlibdeps
index 552687e491f04c90e36563135b469b8276d4b024..ebba4746a26132858ae87564b6b9451603863538 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -42,7 +42,7 @@ 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 be set to the 
+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
@@ -79,6 +79,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        if (@filelist) {
                if ($dh{L_PARAMS}) {
                        my @paths=();
+                       # Add to existing paths, if set.
+                       push @paths, $ENV{'LD_LIBRARY_PATH'}
+                               if exists $ENV{'LD_LIBRARY_PATH'}
                        foreach (split(/:/, $dh{L_PARAMS})) {
                                # Force the path absolute.
                                if (m:^/:) {