jvdias 766b4a
--- perl-5.8.8-RC1/lib/ExtUtils/MakeMaker.pm.USE_MM_LD_RUN_PATH	2006-01-20 15:51:09.000000000 -0500
jvdias 766b4a
+++ perl-5.8.8-RC1/lib/ExtUtils/MakeMaker.pm	2006-01-20 16:25:43.000000000 -0500
jvdias 766b4a
@@ -233,7 +233,7 @@
jvdias 766b4a
     PERL_SRC PERM_RW PERM_RWX
jvdias 766b4a
     PL_FILES PM PM_FILTER PMLIBDIRS POLLUTE PPM_INSTALL_EXEC
jvdias 766b4a
     PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
jvdias 766b4a
-    SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
jvdias 766b4a
+    SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
jvdias 766b4a
     XS_VERSION clean depend dist dynamic_lib linkext macro realclean
jvdias 766b4a
     tool_autosplit
jvdias 766b4a
 
jvdias 766b4a
@@ -369,7 +369,27 @@
jvdias 766b4a
         print join(" ", map { "perl($_)>=$self->{PREREQ_PM}->{$_} " } 
jvdias 766b4a
                         sort keys %{$self->{PREREQ_PM}}), "\n";
jvdias 766b4a
         exit 0;
jvdias 766b4a
-   }
jvdias 766b4a
+    }
jvdias 766b4a
+   
jvdias 766b4a
+    # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation
jvdias 766b4a
+    if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
jvdias 766b4a
+       &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
jvdias 766b4a
+	 ||( exists( $ENV{USE_MM_LD_RUN_PATH} ) 
jvdias 766b4a
+           &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ )
jvdias 766b4a
+	    )
jvdias 766b4a
+	 )
jvdias 766b4a
+       )
jvdias 766b4a
+    {
jvdias 766b4a
+	my $v = $1;
jvdias 766b4a
+	if( $v )
jvdias 766b4a
+	{
jvdias 766b4a
+	    $v = ($v=~/=([01])$/)[0];
jvdias 766b4a
+	}else
jvdias 766b4a
+	{
jvdias 766b4a
+	    $v = 1;
jvdias 766b4a
+	};
jvdias 766b4a
+	$self->{USE_MM_LD_RUN_PATH}=$v;
jvdias 766b4a
+    };
jvdias 766b4a
 
jvdias 766b4a
     print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose;
jvdias 766b4a
     if (-f "MANIFEST" && ! -f "Makefile"){
jvdias 766b4a
@@ -1373,13 +1393,13 @@
jvdias 766b4a
 
jvdias 766b4a
 This is the root directory into which the code will be installed.  It
jvdias 766b4a
 I<prepends itself="" to="" the="" normal="" prefix="">.  For example, if your code
jvdias 766b4a
-would normally go into F</usr> you could set DESTDIR=~/tmp/
jvdias 766b4a
-and installation would go into F<~/tmp/usr/local/lib/perl>.
jvdias 766b4a
+would normally go into /usr/local/lib/perl you could set DESTDIR=~/myperl/
jvdias 766b4a
+and installation would go into ~/myperl/usr/local/lib/perl.
jvdias 766b4a
 
jvdias 766b4a
 This is primarily of use for people who repackage Perl modules.
jvdias 766b4a
 
jvdias 766b4a
 NOTE: Due to the nature of make, it is important that you put the trailing
jvdias 766b4a
-slash on your DESTDIR.  F<~/tmp/> not F<~/tmp>.
jvdias 766b4a
+slash on your DESTDIR.  F<"~/myperl/"> not F<"~/myperl">.
jvdias 766b4a
 
jvdias 766b4a
 =item DIR
jvdias 766b4a
 
jvdias 766b4a
@@ -2057,6 +2077,40 @@
jvdias 766b4a
 precedence, even if it isn't listed in TYPEMAPS.  The default system
jvdias 766b4a
 typemap has lowest precedence.
jvdias 766b4a
 
jvdias 766b4a
+=item USE_MM_LD_RUN_PATH
jvdias 766b4a
+
jvdias 766b4a
+boolean
jvdias 766b4a
+The Red Hat perl MakeMaker distribution differs from the standard 
jvdias 766b4a
+upstream release in that it disables use of the MakeMaker generated
jvdias 766b4a
+LD_RUN_PATH by default, UNLESS this attribute is specified , or the
jvdias 766b4a
+USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run.
jvdias 766b4a
+
jvdias 766b4a
+The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH 
jvdias 766b4a
+to the concatenation of every -L ld(1) option directory in which a -l ld(1)
jvdias 766b4a
+option library is found, which is used as the ld(1) -rpath option if none 
jvdias 766b4a
+is specified. This means that, if your application builds shared libraries 
jvdias 766b4a
+and your MakeMaker application links to them, that the absolute paths of the
jvdias 766b4a
+libraries in the build tree will be inserted into the RPATH header of all 
jvdias 766b4a
+MakeMaker generated binaries, and that such binaries will be unable to link 
jvdias 766b4a
+to these libraries if they do not still reside in the build tree directories 
jvdias 766b4a
+(unlikely) or in the system library directories (/lib or /usr/lib), regardless 
jvdias 766b4a
+of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and
jvdias 766b4a
+ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib,
jvdias 766b4a
+ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH 
jvdias 766b4a
+is set to include /some_directory_other_than_usr_lib, because RPATH overrides
jvdias 766b4a
+LD_LIBRARY_PATH.
jvdias 766b4a
+
jvdias 766b4a
+So for Red Hat MakeMaker builds LD_RUN_PATH is NOT generated by default for
jvdias 766b4a
+every link. You can still use explicit -rpath ld options or the LD_RUN_PATH
jvdias 766b4a
+environment variable during the build to generate an RPATH for the binaries.
jvdias 766b4a
+ 
jvdias 766b4a
+You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command
jvdias 766b4a
+line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH
jvdias 766b4a
+for every link command. 
jvdias 766b4a
+
jvdias 766b4a
+USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the 
jvdias 766b4a
+$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run. 
jvdias 766b4a
+
jvdias 766b4a
 =item VENDORPREFIX
jvdias 766b4a
 
jvdias 766b4a
 Like PERLPREFIX, but only for the vendor install locations.
jvdias 766b4a
--- perl-5.8.8-RC1/lib/ExtUtils/MM_Unix.pm.USE_MM_LD_RUN_PATH	2005-10-21 10:11:03.000000000 -0400
jvdias 766b4a
+++ perl-5.8.8-RC1/lib/ExtUtils/MM_Unix.pm	2006-01-20 16:20:25.000000000 -0500
jvdias 766b4a
@@ -941,7 +941,7 @@
jvdias 766b4a
     }
jvdias 766b4a
 
jvdias 766b4a
     my $ld_run_path_shell = "";
jvdias 766b4a
-    if ($self->{LD_RUN_PATH} ne "") {
jvdias 766b4a
+    if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
jvdias 766b4a
 	$ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
jvdias 766b4a
     }
jvdias 766b4a
 
jvdias 766b4a
--- perl-5.8.8-RC1/lib/ExtUtils/Liblist.pm.USE_MM_LD_RUN_PATH	2003-04-07 14:58:17.000000000 -0400
jvdias 766b4a
+++ perl-5.8.8-RC1/lib/ExtUtils/Liblist.pm	2006-01-20 16:21:57.000000000 -0500
jvdias 766b4a
@@ -87,6 +87,11 @@
jvdias 766b4a
 in LDLOADLIBS. It is passed as an environment variable to the process
jvdias 766b4a
 that links the shared library.
jvdias 766b4a
 
jvdias 766b4a
+Red Hat extension: This generation of LD_RUN_PATH is disabled by default.
jvdias 766b4a
+To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH
jvdias 766b4a
+MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH
jvdias 766b4a
+environment variable). 
jvdias 766b4a
+
jvdias 766b4a
 =head2 BSLOADLIBS
jvdias 766b4a
 
jvdias 766b4a
 List of those libraries that are needed but can be linked in