summaryrefslogtreecommitdiff
path: root/dh_shlibdeps
diff options
context:
space:
mode:
authorjoey <joey>2001-05-24 18:17:17 +0000
committerjoey <joey>2001-05-24 18:17:17 +0000
commit2e8f5be5cf644bcc85d902b71c951de01a2cb200 (patch)
tree4f4ef8ee7d5c7946fe9dd08d9e3f053ab2c74cfa /dh_shlibdeps
parente03b78fce8442511e125cc57922267578d07fa29 (diff)
r470: * dh_makeshlins: append to LD_LIBRARY_PATH at start, not each time
through loop. Closes: #98598
Diffstat (limited to 'dh_shlibdeps')
-rwxr-xr-xdh_shlibdeps38
1 files changed, 20 insertions, 18 deletions
diff --git a/dh_shlibdeps b/dh_shlibdeps
index 274aeed..744aa5b 100755
--- 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);
}
}