[gentoo-commits] gentoo-x86 commit in perl-core/ExtUtils-MakeMaker/files: RUNPATH-6.54.patch

[Torsten Veller (tove)]

tove        10/04/30 06:36:35

  Added:                RUNPATH-6.54.patch
  Log:
  Import from perl-experimental
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch?rev=1.1&view=markup
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

Index: RUNPATH-6.54.patch
===================================================================
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;
         }
     }