From ec46d23bcfe93abb80cf5e56552fbb2e264e7db3 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Apr 29 2019 11:08:25 +0000 Subject: 7.36 bump --- diff --git a/.gitignore b/.gitignore index 517c49d..8dc5c00 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /ExtUtils-MakeMaker-7.30.tar.gz /ExtUtils-MakeMaker-7.32.tar.gz /ExtUtils-MakeMaker-7.34.tar.gz +/ExtUtils-MakeMaker-7.36.tar.gz diff --git a/ExtUtils-MakeMaker-7.30-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-7.30-USE_MM_LD_RUN_PATH.patch deleted file mode 100644 index 7a56c3f..0000000 --- a/ExtUtils-MakeMaker-7.30-USE_MM_LD_RUN_PATH.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 83b4921f10f9df96ec359e20489864080f7b37ca 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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++- - 3 files changed, 61 insertions(+), 2 deletions(-) - -diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm -index 15eed3c..219e96b 100644 ---- a/lib/ExtUtils/Liblist.pm -+++ b/lib/ExtUtils/Liblist.pm -@@ -89,6 +89,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 6233513..198f05e 100644 ---- a/lib/ExtUtils/MM_Unix.pm -+++ b/lib/ExtUtils/MM_Unix.pm -@@ -1045,7 +1045,7 @@ sub xs_make_dynamic_lib { - } - - 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 3d4913e..b52c96d 100644 ---- a/lib/ExtUtils/MakeMaker.pm -+++ b/lib/ExtUtils/MakeMaker.pm -@@ -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 - -@@ -503,6 +503,26 @@ sub new { - $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){ - check_manifest(); -@@ -2797,6 +2817,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. --- -2.13.6 - diff --git a/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch new file mode 100644 index 0000000..4afa3d5 --- /dev/null +++ b/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch @@ -0,0 +1,134 @@ +From 9b80126d33174059a03502521d5cb1fdc9b2c3a1 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 | 56 ++++++++++++++++++++++++++++++++++++++- + 3 files changed, 61 insertions(+), 2 deletions(-) + +diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm +index 44c4c39..3983194 100644 +--- a/lib/ExtUtils/Liblist.pm ++++ b/lib/ExtUtils/Liblist.pm +@@ -89,6 +89,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 a0a2ee1..dda54bb 100644 +--- a/lib/ExtUtils/MM_Unix.pm ++++ b/lib/ExtUtils/MM_Unix.pm +@@ -1074,7 +1074,7 @@ sub xs_make_dynamic_lib { + } + + 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 90790d4..f5459eb 100644 +--- a/lib/ExtUtils/MakeMaker.pm ++++ b/lib/ExtUtils/MakeMaker.pm +@@ -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 PUREPERL_ONLY +- 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 + +@@ -503,6 +503,26 @@ sub new { + $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){ + check_manifest(); +@@ -2837,6 +2857,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. +-- +2.20.1 + diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index 6591d8e..fb41717 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -5,15 +5,15 @@ Name: perl-%{cpan_name} Epoch: 1 -Version: 7.34 -Release: 419%{?dist} +Version: 7.36 +Release: 1%{?dist} Summary: Create a module Makefile License: GPL+ or Artistic URL: https://metacpan.org/release/%{cpan_name} Source0: https://cpan.metacpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz # Do not set RPATH to perl shared-library modules by default. Bug #773622. # This is copy from `perl' package. This is a distributor extension. -Patch0: %{cpan_name}-7.30-USE_MM_LD_RUN_PATH.patch +Patch0: %{cpan_name}-7.36-USE_MM_LD_RUN_PATH.patch # Link to libperl.so explicitly. Bug #960048. Patch1: %{cpan_name}-7.30-Link-to-libperl-explicitly-on-Linux.patch # Unbundle version modules @@ -71,6 +71,7 @@ BuildRequires: perl(POSIX) BuildRequires: perl(subs) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) +BuildRequires: perl(Text::ParseWords) # threads::shared not used BuildRequires: perl(utf8) # XSLoader not used @@ -109,7 +110,7 @@ Requires: perl(Pod::Man) Requires: perl(POSIX) Requires: perl(Test::Harness) Recommends: perl(Time::HiRes) -# Text::ParseWords is not needed (Win32 only) +Requires: perl(Text::ParseWords) # VMS::Filespec is not needed (VMS only) # Win32 is not needed (Win32 only) # If an XS module is compiled, xsubpp(1) is needed @@ -179,11 +180,11 @@ rm -rf lib/ExtUtils/MakeMaker/Locale.pm sed -i -e '/^lib\/ExtUtils\/MakeMaker\/Locale\.pm/ d' MANIFEST %build -BUILDING_AS_PACKAGE=1 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -make %{?_smp_mflags} +BUILDING_AS_PACKAGE=1 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=$RPM_BUILD_ROOT +%{make_install} %{_fixperms} $RPM_BUILD_ROOT/* %check @@ -213,6 +214,9 @@ make test %{_mandir}/man3/ExtUtils::MM::Utils.* %changelog +* Mon Apr 29 2019 Petr Pisar - 1:7.36-1 +- 7.36 bump + * Fri Feb 01 2019 Fedora Release Engineering - 1:7.34-419 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 51dc5fc..32113e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ExtUtils-MakeMaker-7.34.tar.gz) = dbbd404ff65ea1fc9105a6aeb8ebc2250fa23bf1009cb56a900d049782a50db8b894278c0144d61dcea5e3b45558d6e16527ac60313bb6ff7127c1dff0558df6 +SHA512 (ExtUtils-MakeMaker-7.36.tar.gz) = dcc15f85116e4aa0258d3be643d89753b0a6c45db95de15957d1c4edf9cad086c7e670a420dccb3e7758310e3520651add7c8f34609e347f1fc8ecf48160b24f