summaryrefslogtreecommitdiff
path: root/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch
diff options
context:
space:
mode:
Diffstat (limited to 'perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch')
-rw-r--r--perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch b/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch
new file mode 100644
index 00000000000..13852078691
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch
@@ -0,0 +1,17 @@
+diff -Naur ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm
+--- ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm 2009-07-08 11:49:05.000000000 +1200
++++ ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm 2009-08-19 21:37:31.494655658 +1200
+@@ -1799,6 +1799,13 @@
+ # LD_RUN_PATH now computed by ExtUtils::Liblist
+ ($self->{EXTRALIBS}, $self->{BSLOADLIBS},
+ $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};
++ }
+ last;
+ }
+ }