110 lines
5.1 KiB
Diff
110 lines
5.1 KiB
Diff
diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
|
|
--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm.usem 2011-05-08 05:10:08.000000000 +0200
|
|
+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 2011-05-17 11:14:22.169115984 +0200
|
|
@@ -89,6 +89,11 @@ libraries. LD_RUN_PATH is a colon separ
|
|
in LDLOADLIBS. It is passed as an environment variable to the process
|
|
that links the shared library.
|
|
|
|
+Fedora extension: This generation of LD_RUN_PATH is disabled by default.
|
|
+To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH
|
|
+MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH
|
|
+environment variable).
|
|
+
|
|
=head2 BSLOADLIBS
|
|
|
|
List of those libraries that are needed but can be linked in
|
|
diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
|
|
--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm.usem 2011-05-08 05:10:08.000000000 +0200
|
|
+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 2011-05-17 13:39:26.912586030 +0200
|
|
@@ -317,7 +317,7 @@ sub full_setup {
|
|
PERM_DIR PERM_RW PERM_RWX MAGICXS
|
|
PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
|
|
PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
|
|
- SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS
|
|
+ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS
|
|
XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION
|
|
clean depend dist dynamic_lib linkext macro realclean tool_autosplit
|
|
|
|
@@ -501,7 +501,27 @@ sub new {
|
|
# PRINT_PREREQ is RedHatism.
|
|
if ("@ARGV" =~ /\bPRINT_PREREQ\b/) {
|
|
$self->_PRINT_PREREQ;
|
|
- }
|
|
+ }
|
|
+
|
|
+ # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation
|
|
+ if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
|
|
+ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
|
|
+ ||( exists( $ENV{USE_MM_LD_RUN_PATH} )
|
|
+ &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ )
|
|
+ )
|
|
+ )
|
|
+ )
|
|
+ {
|
|
+ my $v = $1;
|
|
+ if( $v )
|
|
+ {
|
|
+ $v = ($v=~/=([01])$/)[0];
|
|
+ }else
|
|
+ {
|
|
+ $v = 1;
|
|
+ };
|
|
+ $self->{USE_MM_LD_RUN_PATH}=$v;
|
|
+ };
|
|
|
|
print "MakeMaker (v$VERSION)\n" if $Verbose;
|
|
if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
|
|
@@ -2821,6 +2841,40 @@ precedence. A typemap in the current di
|
|
precedence, even if it isn't listed in TYPEMAPS. The default system
|
|
typemap has lowest precedence.
|
|
|
|
+=item USE_MM_LD_RUN_PATH
|
|
+
|
|
+boolean
|
|
+The Fedora perl MakeMaker distribution differs from the standard
|
|
+upstream release in that it disables use of the MakeMaker generated
|
|
+LD_RUN_PATH by default, UNLESS this attribute is specified , or the
|
|
+USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run.
|
|
+
|
|
+The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH
|
|
+to the concatenation of every -L ld(1) option directory in which a -l ld(1)
|
|
+option library is found, which is used as the ld(1) -rpath option if none
|
|
+is specified. This means that, if your application builds shared libraries
|
|
+and your MakeMaker application links to them, that the absolute paths of the
|
|
+libraries in the build tree will be inserted into the RPATH header of all
|
|
+MakeMaker generated binaries, and that such binaries will be unable to link
|
|
+to these libraries if they do not still reside in the build tree directories
|
|
+(unlikely) or in the system library directories (/lib or /usr/lib), regardless
|
|
+of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and
|
|
+ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib,
|
|
+ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH
|
|
+is set to include /some_directory_other_than_usr_lib, because RPATH overrides
|
|
+LD_LIBRARY_PATH.
|
|
+
|
|
+So for Fedora MakeMaker builds LD_RUN_PATH is NOT generated by default for
|
|
+every link. You can still use explicit -rpath ld options or the LD_RUN_PATH
|
|
+environment variable during the build to generate an RPATH for the binaries.
|
|
+
|
|
+You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command
|
|
+line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH
|
|
+for every link command.
|
|
+
|
|
+USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the
|
|
+$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run.
|
|
+
|
|
=item VENDORPREFIX
|
|
|
|
Like PERLPREFIX, but only for the vendor install locations.
|
|
diff -up perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.usem perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
|
|
--- perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.usem 2011-05-08 05:10:08.000000000 +0200
|
|
+++ perl-5.14.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2011-05-17 11:14:22.172115972 +0200
|
|
@@ -1045,7 +1045,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
|
|
}
|
|
|
|
my $ld_run_path_shell = "";
|
|
- if ($self->{LD_RUN_PATH} ne "") {
|
|
+ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
|
|
$ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
|
|
}
|
|
|