diff --git a/.gitignore b/.gitignore index 92d75b5..b5fc7ee 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /ExtUtils-MakeMaker-6.80.tar.gz /ExtUtils-MakeMaker-6.82.tar.gz /ExtUtils-MakeMaker-6.84.tar.gz +/ExtUtils-MakeMaker-6.86.tar.gz diff --git a/ExtUtils-MakeMaker-6.84-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-6.84-USE_MM_LD_RUN_PATH.patch deleted file mode 100644 index 30900d0..0000000 --- a/ExtUtils-MakeMaker-6.84-USE_MM_LD_RUN_PATH.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 1f6cb4c0a4c36b0aec220e5133bac7d2d1d83bf1 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 684157a..1a40c26 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 a7a5e1b..1efaaa6 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 eced66d..676742e 100644 ---- a/lib/ExtUtils/MakeMaker.pm -+++ b/lib/ExtUtils/MakeMaker.pm -@@ -282,7 +282,7 @@ sub full_setup { - PERL_SRC PERM_DIR PERM_RW PERM_RWX MAGICXS - 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 - -@@ -432,7 +432,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}){ -@@ -2608,6 +2628,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 620444a..97bf742 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,5 +1,5 @@ %global cpan_name ExtUtils-MakeMaker -%global cpan_version 6.84 +%global cpan_version 6.86 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.84-USE_MM_LD_RUN_PATH.patch +Patch0: %{cpan_name}-6.86-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 @@ -32,8 +32,10 @@ BuildRequires: perl(warnings) BuildRequires: perl(File::Copy::Recursive) # Tests: BuildRequires: perl(AutoSplit) +BuildRequires: perl(base) BuildRequires: perl(CPAN::Meta) BuildRequires: perl(Data::Dumper) +BuildRequires: perl(DirHandle) BuildRequires: perl(DynaLoader) BuildRequires: perl(ExtUtils::Command) BuildRequires: perl(ExtUtils::Install) @@ -43,15 +45,24 @@ BuildRequires: perl(File::Find) BuildRequires: perl(File::Temp) BuildRequires: perl(Getopt::Long) BuildRequires: perl(IO::File) +# IO::Handle not used BuildRequires: perl(less) +BuildRequires: perl(overload) BuildRequires: perl(Parse::CPAN::Meta) BuildRequires: perl(Pod::Man) BuildRequires: perl(POSIX) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(subs) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) +# threads::shared not used BuildRequires: perl(version) +# XSLoader not used # Optional tests BuildRequires: perl(ExtUtils::CBuilder) +BuildRequires: perl(PerlIO) +# Keep YAML optional +# Keep YAML::Tiny optional Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # CPAN::Meta is optional Requires: perl(Data::Dumper) @@ -111,6 +122,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Jan 06 2014 Petr Pisar - 6.86-1 +- 6.86 bump + * Mon Dec 02 2013 Petr Pisar - 6.84-1 - 6.84 bump diff --git a/sources b/sources index 3312343..1e7544c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c0ab3435d3a85a4eaa55265b09aa5799 ExtUtils-MakeMaker-6.84.tar.gz +c26d8a0e0a34b3c4a035808c298da697 ExtUtils-MakeMaker-6.86.tar.gz