diff --git a/.gitignore b/.gitignore index 1c5658f..b4ba38d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /ExtUtils-MakeMaker-6.76.tar.gz /ExtUtils-MakeMaker-6.78.tar.gz /ExtUtils-MakeMaker-6.80.tar.gz +/ExtUtils-MakeMaker-6.82.tar.gz diff --git a/ExtUtils-MakeMaker-6.80-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-6.80-USE_MM_LD_RUN_PATH.patch deleted file mode 100644 index 103a7e1..0000000 --- a/ExtUtils-MakeMaker-6.80-USE_MM_LD_RUN_PATH.patch +++ /dev/null @@ -1,136 +0,0 @@ -From a8b626a47227ec94882257ec19f53f1dcc4e6ccf 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 1/2] Do not set RPATH by default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Former behavior can be forced by setting USE_MM_LD_RUN_PATH -environment variable to 1. - -This is copy from `perl' package. -See . - -Signed-off-by: Petr Písař ---- - 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 76785a3..a43f290 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 a9bcd47..003c9ae 100644 ---- a/lib/ExtUtils/MM_Unix.pm -+++ b/lib/ExtUtils/MM_Unix.pm -@@ -946,7 +946,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO - } - - 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 bf0dc9f..539b175 100644 ---- a/lib/ExtUtils/MakeMaker.pm -+++ b/lib/ExtUtils/MakeMaker.pm -@@ -281,7 +281,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 TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS XSOPT XSPROTOARG -+ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG - XS_VERSION clean depend dist dynamic_lib linkext macro realclean - tool_autosplit - -@@ -431,7 +431,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" && ! $ENV{PERL_CORE}){ -@@ -2600,6 +2620,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.8.3.1 - diff --git a/ExtUtils-MakeMaker-6.82-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-6.82-USE_MM_LD_RUN_PATH.patch new file mode 100644 index 0000000..1de28f2 --- /dev/null +++ b/ExtUtils-MakeMaker-6.82-USE_MM_LD_RUN_PATH.patch @@ -0,0 +1,136 @@ +From 8cdd24ede62bb89dd6dd5ea3373ae21569502b11 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Former behavior can be forced by setting USE_MM_LD_RUN_PATH +environment variable to 1. + +This is copy from `perl' package. +See . + +Signed-off-by: Petr Písař +--- + 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 d396c1f..aa74457 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 9ba094e..b951fa9 100644 +--- a/lib/ExtUtils/MM_Unix.pm ++++ b/lib/ExtUtils/MM_Unix.pm +@@ -946,7 +946,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO + } + + 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 55c9181..e9be4a6 100644 +--- a/lib/ExtUtils/MakeMaker.pm ++++ b/lib/ExtUtils/MakeMaker.pm +@@ -281,7 +281,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 TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS XSOPT XSPROTOARG ++ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG + XS_VERSION clean depend dist dynamic_lib linkext macro realclean + tool_autosplit + +@@ -431,7 +431,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" && ! $ENV{PERL_CORE}){ +@@ -2603,6 +2623,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.8.3.1 + diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index d679354..97e6441 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,5 +1,5 @@ %global cpan_name ExtUtils-MakeMaker -%global cpan_version 6.80 +%global cpan_version 6.82 Name: perl-%{cpan_name} Version: %(echo '%{cpan_version}' | tr _ .) @@ -11,7 +11,7 @@ URL: http://search.cpan.org/dist/%{cpan_name}/ Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{cpan_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: %{cpan_name}-6.80-USE_MM_LD_RUN_PATH.patch +Patch0: %{cpan_name}-6.82-USE_MM_LD_RUN_PATH.patch # Link to libperl.so explicitly. Bug #960048. Patch1: %{cpan_name}-6.80-Link-to-libperl-explicitly-on-Linux.patch BuildArch: noarch @@ -111,6 +111,9 @@ make test %{_mandir}/man3/* %changelog +* Tue Nov 05 2013 Petr Pisar - 6.82-1 +- 6.82 bump + * Wed Oct 16 2013 Petr Pisar - 6.80-1 - 6.80 bump diff --git a/sources b/sources index 63dc691..e3c7d62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bab69a513182890e5c5cd5cdc948a51 ExtUtils-MakeMaker-6.80.tar.gz +5d7b18443dbc16a64dca73348553c45e ExtUtils-MakeMaker-6.82.tar.gz