r470: * dh_makeshlins: append to LD_LIBRARY_PATH at start, not each time

     through loop. Closes: #98598

diff --git a/debian/changelog b/debian/changelog
index 7017569594b7b5eae7789fb18a40568b2a7fe56b..e0a612416a343b23319fa54164b3fdbfe511743a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (3.0.25) unstable; urgency=low
+
+  * dh_makeshlins: append to LD_LIBRARY_PATH at start, not each time
+    through loop. Closes: #98598
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 24 May 2001 14:16:50 -0400
+
 debhelper (3.0.24) unstable; urgency=low
 
   * Missing semi-colon.

diff --git a/dh_shlibdeps b/dh_shlibdeps
index 274aeeda027a93e51c388f4a498de3a20b2ce3cc..744aa5bfdd29159cb039f53972b8cee015d9d10e 100755 (executable)
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -55,6 +55,26 @@ dpkg-shlibdeps.
 
 init();
 
+# Add directory to library search path.
+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:^/:) {
+                       push @paths, $_;
+               }
+               else {
+                       push @paths, getcwd()."/$_";
+               }
+       }
+       $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}}) {
        my $tmp=tmpdir($package);
        my $ext=pkgext($package);
@@ -77,24 +97,6 @@ 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:^/:) {
-                                       push @paths, $_;
-                               }
-                               else {
-                                       push @paths, getcwd()."/$_";
-                               }
-                       }
-                       $dh{L_PARAMS}=join(':', @paths);
-                       $ENV{'LD_LIBRARY_PATH'}=$dh{L_PARAMS};
-                       verbose_print("LD_LIBRARY_PATH=$dh{L_PARAMS} \\");
-               }
                doit("dpkg-shlibdeps","-Tdebian/${ext}substvars",@{$dh{U_PARAMS}},'-dDepends',@filelist);
        }
 }