perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
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;
         }
     }