diff --git a/.gitignore b/.gitignore index 686a783..1c5658f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ExtUtils-MakeMaker-6.74.tar.gz /ExtUtils-MakeMaker-6.76.tar.gz /ExtUtils-MakeMaker-6.78.tar.gz +/ExtUtils-MakeMaker-6.80.tar.gz diff --git a/ExtUtils-MakeMaker-6.74-Link-to-libperl-explicitly-on-Linux.patch b/ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch similarity index 85% rename from ExtUtils-MakeMaker-6.74-Link-to-libperl-explicitly-on-Linux.patch rename to ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch index 2bd2261..1f81024 100644 --- a/ExtUtils-MakeMaker-6.74-Link-to-libperl-explicitly-on-Linux.patch +++ b/ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch @@ -1,4 +1,4 @@ -From fcbc29e36fcaa04f8d0ec51053379ca02f3f97d2 Mon Sep 17 00:00:00 2001 +From 2e21a89c677737d87f8c279537791e0f795817b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 2 Jul 2013 10:28:15 +0200 Subject: [PATCH 2/2] Link to libperl explicitly on Linux @@ -15,7 +15,7 @@ Signed-off-by: Petr Písař 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm -index 87dc0bb..f58c0f8 100644 +index 003c9ae..fd2ef8c 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -31,6 +31,7 @@ BEGIN { @@ -26,7 +26,7 @@ index 87dc0bb..f58c0f8 100644 $Is{SunOS4} = $^O eq 'sunos'; $Is{Solaris} = $^O eq 'solaris'; $Is{SunOS} = $Is{SunOS4} || $Is{Solaris}; -@@ -938,7 +939,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). +@@ -933,7 +934,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO my $libs = '$(LDLOADLIBS)'; @@ -35,7 +35,7 @@ index 87dc0bb..f58c0f8 100644 # Use nothing on static perl platforms, and to the flags needed # to link against the shared libperl library on shared perl # platforms. We peek at lddlflags to see if we need -Wl,-R -@@ -947,6 +948,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). +@@ -942,6 +943,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO $libs .= ' -L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -Wl,-R$(PERL_ARCHLIB)/CORE -lperl'; } elsif ($Config{'lddlflags'} =~ /-R/) { $libs .= ' -L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -R$(PERL_ARCHLIB)/CORE -lperl'; @@ -48,5 +48,5 @@ index 87dc0bb..f58c0f8 100644 } -- -1.8.1.4 +1.8.3.1 diff --git a/ExtUtils-MakeMaker-6.78-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-6.80-USE_MM_LD_RUN_PATH.patch similarity index 94% rename from ExtUtils-MakeMaker-6.78-USE_MM_LD_RUN_PATH.patch rename to ExtUtils-MakeMaker-6.80-USE_MM_LD_RUN_PATH.patch index c375e95..103a7e1 100644 --- a/ExtUtils-MakeMaker-6.78-USE_MM_LD_RUN_PATH.patch +++ b/ExtUtils-MakeMaker-6.80-USE_MM_LD_RUN_PATH.patch @@ -1,7 +1,7 @@ -From f1ecee95126ddf461e9a8d2a73ecdd3948a41639 Mon Sep 17 00:00:00 2001 +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] Do not set RPATH by default +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 @@ -20,7 +20,7 @@ Signed-off-by: Petr Písař 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm -index a94f010..5103f44 100644 +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 @@ -36,10 +36,10 @@ index a94f010..5103f44 100644 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 6c1130d..d2889ab 100644 +index a9bcd47..003c9ae 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm -@@ -951,7 +951,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). +@@ -946,7 +946,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO } my $ld_run_path_shell = ""; @@ -49,7 +49,7 @@ index 6c1130d..d2889ab 100644 } diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm -index a7e7ff3..d54fbb2 100644 +index bf0dc9f..539b175 100644 --- a/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm @@ -281,7 +281,7 @@ sub full_setup { diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index 1fd758e..d679354 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,5 +1,5 @@ %global cpan_name ExtUtils-MakeMaker -%global cpan_version 6.78 +%global cpan_version 6.80 Name: perl-%{cpan_name} 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 # 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.78-USE_MM_LD_RUN_PATH.patch +Patch0: %{cpan_name}-6.80-USE_MM_LD_RUN_PATH.patch # Link to libperl.so explicitly. Bug #960048. -Patch1: %{cpan_name}-6.74-Link-to-libperl-explicitly-on-Linux.patch +Patch1: %{cpan_name}-6.80-Link-to-libperl-explicitly-on-Linux.patch BuildArch: noarch BuildRequires: perl # Makefile.Pl uses ExtUtils::MakeMaker from ./lib @@ -111,6 +111,9 @@ make test %{_mandir}/man3/* %changelog +* Wed Oct 16 2013 Petr Pisar - 6.80-1 +- 6.80 bump + * Tue Sep 24 2013 Petr Pisar - 6.78-1 - 6.78 bump diff --git a/sources b/sources index de8701c..63dc691 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -843886bc1060b5e5c619e34029343eba ExtUtils-MakeMaker-6.78.tar.gz +8bab69a513182890e5c5cd5cdc948a51 ExtUtils-MakeMaker-6.80.tar.gz