6.74 bump

This commit is contained in:
Petr Písař 2013-09-02 12:30:39 +02:00
parent a9a766efbb
commit 7e1ab35c00
5 changed files with 18 additions and 14 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/ExtUtils-MakeMaker-6.66.tar.gz /ExtUtils-MakeMaker-6.66.tar.gz
/ExtUtils-MakeMaker-6.68.tar.gz /ExtUtils-MakeMaker-6.68.tar.gz
/ExtUtils-MakeMaker-6.72.tar.gz /ExtUtils-MakeMaker-6.72.tar.gz
/ExtUtils-MakeMaker-6.74.tar.gz

View File

@ -1,4 +1,4 @@
From a1fe52f21edba0abf0b3cae4c826cadd3ac714c3 Mon Sep 17 00:00:00 2001 From fcbc29e36fcaa04f8d0ec51053379ca02f3f97d2 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 2/2] Link to libperl explicitly on Linux Subject: [PATCH 2/2] 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 8fafcdf..e645940 100644 index 87dc0bb..f58c0f8 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,7 +26,7 @@ index 8fafcdf..e645940 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};
@@ -936,7 +937,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). @@ -938,7 +939,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).
my $libs = '$(LDLOADLIBS)'; my $libs = '$(LDLOADLIBS)';
@ -35,7 +35,7 @@ index 8fafcdf..e645940 100644
# 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
@@ -945,6 +946,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). @@ -947,6 +948,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).
$libs .= ' -L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -Wl,-R$(PERL_ARCHLIB)/CORE -lperl'; $libs .= ' -L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -Wl,-R$(PERL_ARCHLIB)/CORE -lperl';
} elsif ($Config{'lddlflags'} =~ /-R/) { } elsif ($Config{'lddlflags'} =~ /-R/) {
$libs .= ' -L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -R$(PERL_ARCHLIB)/CORE -lperl'; $libs .= ' -L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -R$(PERL_ARCHLIB)/CORE -lperl';

View File

@ -1,4 +1,4 @@
From 9a930b03b89379dda183b289bcf9a6e38a404cff Mon Sep 17 00:00:00 2001 From 7d86c1eea112726336642ba44fa16aa8d20922d2 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 1/2] Do not set RPATH by default Subject: [PATCH 1/2] Do not set RPATH by default
@ -20,7 +20,7 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
3 files changed, 62 insertions(+), 3 deletions(-) 3 files changed, 62 insertions(+), 3 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 fb6ea97..659f504 100644 index 431548a..ea8b5c3 100644
--- a/lib/ExtUtils/Liblist.pm --- a/lib/ExtUtils/Liblist.pm
+++ b/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 @@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories
@ -36,10 +36,10 @@ index fb6ea97..659f504 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 110d665..8fafcdf 100644 index 100951f..87dc0bb 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
@@ -949,7 +949,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). @@ -951,7 +951,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).
} }
my $ld_run_path_shell = ""; my $ld_run_path_shell = "";
@ -49,7 +49,7 @@ index 110d665..8fafcdf 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 692f86f..3d3893f 100644 index 5049ef9..08aa432 100644
--- a/lib/ExtUtils/MakeMaker.pm --- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm
@@ -281,7 +281,7 @@ sub full_setup { @@ -281,7 +281,7 @@ sub full_setup {
@ -90,7 +90,7 @@ index 692f86f..3d3893f 100644
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" && ! $ENV{PERL_CORE}){
@@ -2471,6 +2491,40 @@ precedence. A typemap in the current directory has highest @@ -2549,6 +2569,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.

View File

@ -1,5 +1,5 @@
%global cpan_name ExtUtils-MakeMaker %global cpan_name ExtUtils-MakeMaker
%global cpan_version 6.72 %global cpan_version 6.74
Name: perl-%{cpan_name} Name: perl-%{cpan_name}
Version: %(echo '%{cpan_version}' | tr _ .) Version: %(echo '%{cpan_version}' | tr _ .)
@ -11,9 +11,9 @@ 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}-6.72-USE_MM_LD_RUN_PATH.patch Patch0: %{cpan_name}-6.74-USE_MM_LD_RUN_PATH.patch
# Link to libperl.so explicitly. Bug #960048. # Link to libperl.so explicitly. Bug #960048.
Patch1: %{cpan_name}-6.72-Link-to-libperl-explicitly-on-Linux.patch Patch1: %{cpan_name}-6.74-Link-to-libperl-explicitly-on-Linux.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: perl BuildRequires: perl
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib # Makefile.Pl uses ExtUtils::MakeMaker from ./lib
@ -98,6 +98,9 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Mon Sep 02 2013 Petr Pisar <ppisar@redhat.com> - 6.74-1
- 6.74 bump
* Mon Aug 05 2013 Petr Pisar <ppisar@redhat.com> - 6.72-1 * Mon Aug 05 2013 Petr Pisar <ppisar@redhat.com> - 6.72-1
- 6.72 bump - 6.72 bump

View File

@ -1 +1 @@
78bdc7a3a1aaa3c0412a39233fcc847a ExtUtils-MakeMaker-6.72.tar.gz aedab61a75bc8804672930d651dc3ff7 ExtUtils-MakeMaker-6.74.tar.gz