diff --git a/perl-ExtUtils-MakeMaker-6.62-USE_MM_LD_RUN_PATH.patch b/perl-ExtUtils-MakeMaker-6.62-USE_MM_LD_RUN_PATH.patch new file mode 100644 index 0000000..0c6ee5e --- /dev/null +++ b/perl-ExtUtils-MakeMaker-6.62-USE_MM_LD_RUN_PATH.patch @@ -0,0 +1,131 @@ +From dbc43828283bd5ab150e24a6cd18c778e9763d7f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 12 Jan 2012 17:05:19 +0100 +Subject: [PATCH] Do not set RPATH by default + +Former behavior can be forced by setting USE_MM_LD_RUN_PATH +environment variable to 1. + +This is copy from `perl' package. +See . +--- + lib/ExtUtils/Liblist.pm | 5 ++++ + lib/ExtUtils/MM_Unix.pm | 2 +- + lib/ExtUtils/MakeMaker.pm | 58 +++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 62 insertions(+), 3 deletions(-) + +diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm +index c560cb5..2bd523c 100644 +--- a/lib/ExtUtils/Liblist.pm ++++ b/lib/ExtUtils/Liblist.pm +@@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories + 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 --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm +index 764da8c..8ea92bd 100644 +--- a/lib/ExtUtils/MM_Unix.pm ++++ b/lib/ExtUtils/MM_Unix.pm +@@ -945,7 +945,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). + } + + 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)" '; + } + +diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm +index 2aadf98..3c83caa 100644 +--- a/lib/ExtUtils/MakeMaker.pm ++++ b/lib/ExtUtils/MakeMaker.pm +@@ -279,7 +279,7 @@ sub full_setup { + PERL_SRC PERM_DIR PERM_RW PERM_RWX + PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC + PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ +- SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG ++ SIGN SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG + XS_VERSION clean depend dist dynamic_lib linkext macro realclean + tool_autosplit + +@@ -429,7 +429,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 STDOUT "MakeMaker (v$VERSION)\n" if $Verbose; + if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ +@@ -2380,6 +2400,40 @@ precedence. A typemap in the current directory has highest + 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. +-- +1.7.7.5 + diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index d5a7e61..6ae0a95 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,11 +1,14 @@ Name: perl-ExtUtils-MakeMaker Version: 6.62 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Create a module Makefile License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ExtUtils-MakeMaker/ Source0: http://www.cpan.org/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-%{version}.tar.gz +# Do not set RPATH to perl shared-library modules by default. Bug #773622. +# This is copy from `perl' package. This is distributor extension. +Patch0: %{name}-6.62-USE_MM_LD_RUN_PATH.patch BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Spec) >= 0.8 @@ -55,6 +58,7 @@ Dougherty and the perl5-porters. %prep %setup -q -n ExtUtils-MakeMaker-%{version} +%patch0 -p1 # Remove bundled modules rm -rf bundled/* ||: sed -i -e '/^bundled\// d' MANIFEST @@ -80,6 +84,9 @@ make test %{_mandir}/man3/* %changelog +* Thu Jan 12 2012 Petr Pisar - 6.62-2 +- Do not set RPATH to perl shared-library modules by default (bug #773622) + * Fri Nov 25 2011 Petr Pisar 6.62-1 - Specfile autogenerated by cpanspec 1.78. - Remove defattr and BuildRoot from spec.