]>
Commit | Line | Data |
---|---|---|
917e464c JR |
1 | diff -urN perl-5.6.1.orig/lib/ExtUtils/Liblist.pm perl-5.6.1/lib/ExtUtils/Liblist.pm |
2 | --- perl-5.6.1.orig/lib/ExtUtils/Liblist.pm Fri Feb 23 03:57:55 2001 | |
3 | +++ perl-5.6.1/lib/ExtUtils/Liblist.pm Thu Apr 12 20:57:10 2001 | |
4 | @@ -60,6 +60,7 @@ | |
5034ec14 AF |
5 | my(@searchpath); # from "-L/path" entries in $potential_libs |
6 | my(@libpath) = split " ", $Config{'libpth'}; | |
7 | my(@ldloadlibs, @bsloadlibs, @extralibs, @ld_run_path, %ld_run_path_seen); | |
8 | + $ld_run_path_seen{$_} = 1 foreach qw(/usr/X11R6/lib /usr/lib /lib); | |
917e464c | 9 | my(@libs, %libs_seen); |
5034ec14 AF |
10 | my($fullname, $thislib, $thispth, @fullname); |
11 | my($pwd) = cwd(); # from Cwd.pm | |
917e464c JR |
12 | diff -urN perl-5.6.1.orig/lib/ExtUtils/MM_Unix.pm perl-5.6.1/lib/ExtUtils/MM_Unix.pm |
13 | --- perl-5.6.1.orig/lib/ExtUtils/MM_Unix.pm Thu Apr 12 20:29:35 2001 | |
14 | +++ perl-5.6.1/lib/ExtUtils/MM_Unix.pm Thu Apr 12 20:56:30 2001 | |
15 | @@ -524,9 +524,16 @@ | |
5034ec14 AF |
16 | }; |
17 | my($tmp); | |
18 | for $tmp (qw/ | |
19 | - EXTRALIBS LDLOADLIBS BSLOADLIBS LD_RUN_PATH | |
20 | + EXTRALIBS LDLOADLIBS BSLOADLIBS | |
21 | /) { | |
22 | next unless defined $self->{$tmp}; | |
23 | + push @m, "$tmp = $self->{$tmp}\n"; | |
24 | + } | |
25 | + # don't set LD_RUN_PATH if empty | |
26 | + for $tmp (qw/ | |
27 | + LD_RUN_PATH | |
28 | + /) { | |
29 | + next unless $self->{$tmp}; | |
30 | push @m, "$tmp = $self->{$tmp}\n"; | |
31 | } | |
32 | return join "", @m; |