1 |
tove 10/04/30 06:36:35 |
2 |
|
3 |
Added: RUNPATH-6.54.patch |
4 |
Log: |
5 |
Import from perl-experimental |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: RUNPATH-6.54.patch |
15 |
=================================================================== |
16 |
diff -Naur ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm |
17 |
--- ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm 2009-07-08 11:49:05.000000000 +1200 |
18 |
+++ ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm 2009-08-19 21:37:31.494655658 +1200 |
19 |
@@ -1799,6 +1799,13 @@ |
20 |
# LD_RUN_PATH now computed by ExtUtils::Liblist |
21 |
($self->{EXTRALIBS}, $self->{BSLOADLIBS}, |
22 |
$self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs; |
23 |
+ # We do not want the build root in RPATH |
24 |
+ if (exists $ENV{PORTAGE_TMPDIR}) { |
25 |
+ # If we have PORTAGE_TMPDIR set, strip that, as just testing for |
26 |
+ # /usr and /opt might not be sufficient |
27 |
+ $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/, |
28 |
+ split /:/, $self->{LD_RUN_PATH}; |
29 |
+ } |
30 |
last; |
31 |
} |
32 |
} |