projects / packages / perl.git / blame
| Commit | Line | Data |
|---|---|---|
| 5034ec14 AF |
1 | --- perl-5.6.0/lib/ExtUtils/Liblist.pm.orig Wed Mar 22 17:16:31 2000 |
| 2 | +++ perl-5.6.0/lib/ExtUtils/Liblist.pm Fri Aug 18 01:03:48 2000 | |
| 3 | @@ -39,6 +39,7 @@ | |
| 4 | my(@searchpath); # from "-L/path" entries in $potential_libs | |
| 5 | my(@libpath) = split " ", $Config{'libpth'}; | |
| 6 | my(@ldloadlibs, @bsloadlibs, @extralibs, @ld_run_path, %ld_run_path_seen); | |
| 7 | + $ld_run_path_seen{$_} = 1 foreach qw(/usr/X11R6/lib /usr/lib /lib); | |
| 8 | my($fullname, $thislib, $thispth, @fullname); | |
| 9 | my($pwd) = cwd(); # from Cwd.pm | |
| 10 | my($found) = 0; | |
| 11 | --- perl-5.6.0/lib/ExtUtils/MM_Unix.pm~ Fri Aug 18 01:03:48 2000 | |
| 12 | +++ perl-5.6.0/lib/ExtUtils/MM_Unix.pm Fri Aug 18 01:04:22 2000 | |
| 13 | @@ -529,9 +529,16 @@ | |
| 14 | }; | |
| 15 | my($tmp); | |
| 16 | for $tmp (qw/ | |
| 17 | - EXTRALIBS LDLOADLIBS BSLOADLIBS LD_RUN_PATH | |
| 18 | + EXTRALIBS LDLOADLIBS BSLOADLIBS | |
| 19 | /) { | |
| 20 | next unless defined $self->{$tmp}; | |
| 21 | + push @m, "$tmp = $self->{$tmp}\n"; | |
| 22 | + } | |
| 23 | + # don't set LD_RUN_PATH if empty | |
| 24 | + for $tmp (qw/ | |
| 25 | + LD_RUN_PATH | |
| 26 | + /) { | |
| 27 | + next unless $self->{$tmp}; | |
| 28 | push @m, "$tmp = $self->{$tmp}\n"; | |
| 29 | } | |
| 30 | return join "", @m; |