View | Details | Raw Unified
Collapse All | Expand All

(-) perl-5.8.7/lib/ExtUtils/MM_Unix.pm (+11 lines)
 Lines 1915-1920    Link Here 
	    # LD_RUN_PATH now computed by ExtUtils::Liblist
	    # LD_RUN_PATH now computed by ExtUtils::Liblist
	    ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
	    ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
             $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
             $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
	    # We do not want the build root in RPATH
	    if (exists $ENV{PORTAGE_TMPDIR}) {
	      # If we have PORTAGE_TMPDIR set, strip that, as just testing for
	      # /usr and /opt might not be sufficient
	      $self->{LD_RUN_PATH} = join ':', grep /.../ && !/^\Q$ENV{PORTAGE_TMPDIR}/,
	                             split /:/, $self->{LD_RUN_PATH};
	    } else {
	      # Else just use /usr and /opt paths, and hope for the best
	      $self->{LD_RUN_PATH} = join ':', grep m!^/(?:usr|opt)!, split /:/,
	                             $self->{LD_RUN_PATH};
	    }
	    last;
	    last;
	}
	}
    }
    }