rpms/perl-ExtUtils-MakeMaker
7
0
Fork 0
Code Issues Pull Requests Releases Activity

7.08 bump

Browse Source
This commit is contained in:
Petr Písař 2015-09-09 10:24:35 +02:00
parent 9ac29b40bb
commit 16ae9d0eea
6 changed files with 43 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@
/ExtUtils-MakeMaker-7.02.tar.gz /ExtUtils-MakeMaker-7.02.tar.gz
/ExtUtils-MakeMaker-7.04.tar.gz /ExtUtils-MakeMaker-7.04.tar.gz
/ExtUtils-MakeMaker-7.06.tar.gz /ExtUtils-MakeMaker-7.06.tar.gz
/ExtUtils-MakeMaker-7.08.tar.gz

12
ExtUtils-MakeMaker-7.06-Remove-new-line-from-INC.patch
View File

@ -1,12 +0,0 @@
diff -up ExtUtils-MakeMaker-7.06/lib/ExtUtils/MM_Unix.pm.orig ExtUtils-MakeMaker-7.06/lib/ExtUtils/MM_Unix.pm
--- ExtUtils-MakeMaker-7.06/lib/ExtUtils/MM_Unix.pm.orig 2015-09-01 13:10:14.810680431 +0200
+++ ExtUtils-MakeMaker-7.06/lib/ExtUtils/MM_Unix.pm 2015-09-01 14:03:30.587696052 +0200
@@ -2948,7 +2948,7 @@ sub pasthru {
my $val = qq{\$($key)};
# expand within perl if given since need to use quote_literal
# since INC might include space-protecting ""!
- $val = $self->{$key} if defined $self->{$key};
+ chomp($val = $self->{$key}) if defined $self->{$key};
$val .= " \$(PASTHRU_$key)";
my $quoted = $self->quote_literal($val);
push @pasthru, qq{PASTHRU_$key=$quoted};

10
ExtUtils-MakeMaker-7.06-Link-to-libperl-explicitly-on-Linux.patch → ExtUtils-MakeMaker-7.08-Link-to-libperl-explicitly-on-Linux.patch
View File

@ -1,4 +1,4 @@
From 92de778d11258fb26185cb6b7258e2dcf6d43b99 Mon Sep 17 00:00:00 2001 From 37785fd42cd049a2465f01adf0db39545157e0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Tue, 2 Jul 2013 10:28:15 +0200 Date: Tue, 2 Jul 2013 10:28:15 +0200
Subject: [PATCH] Link to libperl explicitly on Linux Subject: [PATCH] Link to libperl explicitly on Linux
@ -15,7 +15,7 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
1 file changed, 7 insertions(+), 1 deletion(-) 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 38d780a..8440388 100644 index 94293c7..b31f36f 100644
--- a/lib/ExtUtils/MM_Unix.pm --- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm
@@ -31,6 +31,7 @@ BEGIN { @@ -31,6 +31,7 @@ BEGIN {
@ -26,16 +26,16 @@ index 38d780a..8440388 100644
$Is{SunOS4} = $^O eq 'sunos'; $Is{SunOS4} = $^O eq 'sunos';
$Is{Solaris} = $^O eq 'solaris'; $Is{Solaris} = $^O eq 'solaris';
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris}; $Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
@@ -1016,7 +1017,7 @@ sub xs_make_dynamic_lib { @@ -955,7 +956,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
push(@m," \$(RM_F) \$\@\n");
my $libs = '$(LDLOADLIBS)'; my $libs = '$(LDLOADLIBS)';
- if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') { - if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
+ if (($Is{Linux} || $Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') { + if (($Is{Linux} || $Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
# Use nothing on static perl platforms, and to the flags needed # Use nothing on static perl platforms, and to the flags needed
# to link against the shared libperl library on shared perl # to link against the shared libperl library on shared perl
# platforms. We peek at lddlflags to see if we need -Wl,-R # platforms. We peek at lddlflags to see if we need -Wl,-R
@@ -1029,6 +1030,11 @@ sub xs_make_dynamic_lib { @@ -968,6 +969,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
# The Android linker will not recognize symbols from # The Android linker will not recognize symbols from
# libperl unless the module explicitly depends on it. # libperl unless the module explicitly depends on it.
$libs .= ' "-L$(PERL_INC)" -lperl'; $libs .= ' "-L$(PERL_INC)" -lperl';

44
ExtUtils-MakeMaker-7.06-USE_MM_LD_RUN_PATH.patch → ExtUtils-MakeMaker-7.08-USE_MM_LD_RUN_PATH.patch
View File

@ -1,4 +1,4 @@
From 7710f58f372a097887831999c1d724b381492f21 Mon Sep 17 00:00:00 2001 From 17e693f3dbd9deb458882e30ff7bfaebce54d90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 12 Jan 2012 17:05:19 +0100 Date: Thu, 12 Jan 2012 17:05:19 +0100
Subject: [PATCH] Do not set RPATH by default Subject: [PATCH] Do not set RPATH by default
@ -14,16 +14,16 @@ See <https://bugzilla.redhat.com/show_bug.cgi?id=773622>.
Signed-off-by: Petr Písař <ppisar@redhat.com> Signed-off-by: Petr Písař <ppisar@redhat.com>
--- ---
lib/ExtUtils/Liblist.pm | 5 ++++ lib/ExtUtils/Liblist.pm | 5 +++++
lib/ExtUtils/MM_Unix.pm | 2 +- lib/ExtUtils/MM_Unix.pm | 2 +-
lib/ExtUtils/MakeMaker.pm | 58 +++++++++++++++++++++++++++++++++++++++++++++-- lib/ExtUtils/MakeMaker.pm | 56 ++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 62 insertions(+), 3 deletions(-) 3 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
index 0d00242..b451c37 100644 index 7522150..f5b4ede 100644
--- a/lib/ExtUtils/Liblist.pm --- a/lib/ExtUtils/Liblist.pm
+++ b/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 @@ -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 in LDLOADLIBS. It is passed as an environment variable to the process
that links the shared library. that links the shared library.
@ -36,10 +36,10 @@ index 0d00242..b451c37 100644
List of those libraries that are needed but can be linked in 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 diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index f6ed5e6..38d780a 100644 index 3f2cd9d..94293c7 100644
--- a/lib/ExtUtils/MM_Unix.pm --- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm
@@ -1033,7 +1033,7 @@ sub xs_make_dynamic_lib { @@ -972,7 +972,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
} }
my $ld_run_path_shell = ""; my $ld_run_path_shell = "";
@ -49,25 +49,22 @@ index f6ed5e6..38d780a 100644
} }
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 01e906f..bc82b54 100644 index 226f405..f96aaa0 100644
--- a/lib/ExtUtils/MakeMaker.pm --- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm
@@ -312,7 +312,7 @@ sub full_setup { @@ -301,7 +301,7 @@ sub full_setup {
PERM_DIR PERM_RW PERM_RWX MAGICXS PERM_DIR PERM_RW PERM_RWX MAGICXS
PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
- SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS - 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 + SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION XS_VERSION clean depend dist dynamic_lib linkext macro realclean
clean depend dist dynamic_lib linkext macro realclean tool_autosplit tool_autosplit
@@ -478,7 +478,27 @@ sub new { @@ -438,6 +438,26 @@ sub new {
# PRINT_PREREQ is RedHatism.
if ("@ARGV" =~ /\bPRINT_PREREQ\b/) {
$self->_PRINT_PREREQ; $self->_PRINT_PREREQ;
- } }
+ }
+
+ # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation + # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation
+ if ( ( ! $self->{USE_MM_LD_RUN_PATH} ) + if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
+ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/) + &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
@ -87,10 +84,11 @@ index 01e906f..bc82b54 100644
+ }; + };
+ $self->{USE_MM_LD_RUN_PATH}=$v; + $self->{USE_MM_LD_RUN_PATH}=$v;
+ }; + };
+
print "MakeMaker (v$VERSION)\n" if $Verbose; print "MakeMaker (v$VERSION)\n" if $Verbose;
if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
@@ -2760,6 +2780,40 @@ precedence. A typemap in the current directory has highest check_manifest();
@@ -2711,6 +2731,40 @@ precedence. A typemap in the current directory has highest
precedence, even if it isn't listed in TYPEMAPS. The default system precedence, even if it isn't listed in TYPEMAPS. The default system
typemap has lowest precedence. typemap has lowest precedence.

22
perl-ExtUtils-MakeMaker.spec
View File

@ -1,9 +1,9 @@
%global cpan_name ExtUtils-MakeMaker %global cpan_name ExtUtils-MakeMaker
%global cpan_version 7.06 %global cpan_version 7.08
Name: perl-%{cpan_name} Name: perl-%{cpan_name}
Version: %(echo '%{cpan_version}' | tr _ .) Version: %(echo '%{cpan_version}' | tr _ .)
Release: 2%{?dist} Release: 1%{?dist}
Summary: Create a module Makefile Summary: Create a module Makefile
License: GPL+ or Artistic License: GPL+ or Artistic
Group: Development/Libraries Group: Development/Libraries
@ -11,15 +11,13 @@ URL: http://search.cpan.org/dist/%{cpan_name}/
Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{cpan_version}.tar.gz 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. # Do not set RPATH to perl shared-library modules by default. Bug #773622.
# This is copy from `perl' package. This is distributor extension. # This is copy from `perl' package. This is distributor extension.
Patch0: %{cpan_name}-7.06-USE_MM_LD_RUN_PATH.patch Patch0: %{cpan_name}-7.08-USE_MM_LD_RUN_PATH.patch
# Link to libperl.so explicitly. Bug #960048. # Link to libperl.so explicitly. Bug #960048.
Patch1: %{cpan_name}-7.06-Link-to-libperl-explicitly-on-Linux.patch Patch1: %{cpan_name}-7.08-Link-to-libperl-explicitly-on-Linux.patch
# Unbundle version modules # Unbundle version modules
Patch2: %{cpan_name}-7.04-Unbundle-version.patch Patch2: %{cpan_name}-7.04-Unbundle-version.patch
# Unbundle Encode::Locale module # Unbundle Encode::Locale module
Patch3: %{cpan_name}-7.00-Unbundle-Encode-Locale.patch Patch3: %{cpan_name}-7.00-Unbundle-Encode-Locale.patch
# Remove new line from INC - CPAN RT#106808
Patch4: %{cpan_name}-7.06-Remove-new-line-from-INC.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: findutils BuildRequires: findutils
@ -46,13 +44,13 @@ BuildRequires: sed
# Tests: # Tests:
BuildRequires: perl(AutoSplit) BuildRequires: perl(AutoSplit)
BuildRequires: perl(base) BuildRequires: perl(base)
BuildRequires: perl(CPAN::Meta) >= 2.143240 BuildRequires: perl(CPAN::Meta)
BuildRequires: perl(Data::Dumper) BuildRequires: perl(Data::Dumper)
BuildRequires: perl(DirHandle) BuildRequires: perl(DirHandle)
BuildRequires: perl(DynaLoader) BuildRequires: perl(DynaLoader)
BuildRequires: perl(ExtUtils::Install) >= 1.52 BuildRequires: perl(ExtUtils::Install) >= 1.52
# ExtUtils::Installed not used at tests # ExtUtils::Installed not used at tests
BuildRequires: perl(ExtUtils::Manifest) >= 1.70 BuildRequires: perl(ExtUtils::Manifest) >= 1.65
# ExtUtils::Packlist not used at tests # ExtUtils::Packlist not used at tests
# ExtUtils::XSSymSet is not needed (VMS only) # ExtUtils::XSSymSet is not needed (VMS only)
BuildRequires: perl(File::Find) BuildRequires: perl(File::Find)
@ -81,7 +79,7 @@ BuildRequires: perl(PerlIO)
# Keep YAML::Tiny optional # Keep YAML::Tiny optional
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(B) Requires: perl(B)
# CPAN::Meta 2.143240 is optional # CPAN::Meta 2.112150 is optional
# CPAN::Meta::Converter 2.141170 is optional # CPAN::Meta::Converter 2.141170 is optional
# CPAN::Meta::Requirements 2.130 is optional # CPAN::Meta::Requirements 2.130 is optional
Requires: perl(Data::Dumper) Requires: perl(Data::Dumper)
@ -91,7 +89,7 @@ Requires: perl(Encode)
# Keep unbundled Encode::Locale optional, it's not in the core # Keep unbundled Encode::Locale optional, it's not in the core
Requires: perl(ExtUtils::Command) >= 1.19 Requires: perl(ExtUtils::Command) >= 1.19
Requires: perl(ExtUtils::Install) >= 1.52 Requires: perl(ExtUtils::Install) >= 1.52
Requires: perl(ExtUtils::Manifest) >= 1.70 Requires: perl(ExtUtils::Manifest) >= 1.65
# ExtUtils::XSSymSet is not needed (VMS only) # ExtUtils::XSSymSet is not needed (VMS only)
Requires: perl(File::Find) Requires: perl(File::Find)
Requires: perl(File::Spec) >= 0.8 Requires: perl(File::Spec) >= 0.8
@ -143,7 +141,6 @@ easier to deal with in Makefiles.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# Remove bundled modules # Remove bundled modules
rm -rf bundled rm -rf bundled
sed -i -e '/^bundled\// d' MANIFEST sed -i -e '/^bundled\// d' MANIFEST
@ -181,6 +178,9 @@ make test
%{_mandir}/man3/ExtUtils::Command.* %{_mandir}/man3/ExtUtils::Command.*
%changelog %changelog
* Wed Sep 09 2015 Petr Pisar <ppisar@redhat.com> - 7.08-1
- 7.08 bump
* Tue Sep 01 2015 Jitka Plesnikova <jplesnik@redhat.com> - 7.06-2 * Tue Sep 01 2015 Jitka Plesnikova <jplesnik@redhat.com> - 7.06-2
- Remove new line from INC (CPAN RT#106808) - Remove new line from INC (CPAN RT#106808)

2
sources
View File

@ -1 +1 @@
d86589e2a88c00c7f0f40dc8d432ecde ExtUtils-MakeMaker-7.06.tar.gz 18c3f1965c0cb254ff42ba8a5ebe0995 ExtUtils-MakeMaker-7.08.tar.gz