[perl-ExtUtils-MakeMaker] 6.88 bump
Petr Pisar
ppisar at fedoraproject.org
Mon Feb 3 11:05:12 UTC 2014
commit 9f1798cf00f3541e6de85b192173d5a6d212ccfb
Author: Petr Písař <ppisar at redhat.com>
Date: Mon Feb 3 10:57:48 2014 +0100
6.88 bump
.gitignore | 1 +
...-6.88-Link-to-libperl-explicitly-on-Linux.patch | 40 ++++++++++---------
...xtUtils-MakeMaker-6.88-USE_MM_LD_RUN_PATH.patch | 16 ++++----
perl-ExtUtils-MakeMaker.spec | 9 +++-
sources | 2 +-
5 files changed, 37 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b5fc7ee..1afc078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/ExtUtils-MakeMaker-6.82.tar.gz
/ExtUtils-MakeMaker-6.84.tar.gz
/ExtUtils-MakeMaker-6.86.tar.gz
+/ExtUtils-MakeMaker-6.88.tar.gz
diff --git a/ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch b/ExtUtils-MakeMaker-6.88-Link-to-libperl-explicitly-on-Linux.patch
similarity index 53%
rename from ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch
rename to ExtUtils-MakeMaker-6.88-Link-to-libperl-explicitly-on-Linux.patch
index 1f81024..ea6c552 100644
--- a/ExtUtils-MakeMaker-6.80-Link-to-libperl-explicitly-on-Linux.patch
+++ b/ExtUtils-MakeMaker-6.88-Link-to-libperl-explicitly-on-Linux.patch
@@ -1,7 +1,7 @@
-From 2e21a89c677737d87f8c279537791e0f795817b2 Mon Sep 17 00:00:00 2001
+From 58d583f98d3730f1f75389f7d25f6079cab91357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Tue, 2 Jul 2013 10:28:15 +0200
-Subject: [PATCH 2/2] Link to libperl explicitly on Linux
+Subject: [PATCH] Link to libperl explicitly on Linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -11,11 +11,11 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Písař <ppisar at redhat.com>
---
- lib/ExtUtils/MM_Unix.pm | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ lib/ExtUtils/MM_Unix.pm | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
-index 003c9ae..fd2ef8c 100644
+index a889217..0896ea5 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -31,6 +31,7 @@ BEGIN {
@@ -26,27 +26,29 @@ index 003c9ae..fd2ef8c 100644
$Is{SunOS4} = $^O eq 'sunos';
$Is{Solaris} = $^O eq 'solaris';
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
-@@ -933,7 +934,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
+@@ -934,7 +935,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
my $libs = '$(LDLOADLIBS)';
-- if (($Is{NetBSD} || $Is{Interix}) && $Config{'useshrplib'} eq 'true') {
-+ if (($Is{Linux} || $Is{NetBSD} || $Is{Interix}) && $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') {
# 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
-@@ -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';
-+ } else {
-+ if ($ENV{PERL_CORE}) {
-+ $libs .= ' -L$(PERL_INC)';
-+ }
-+ $libs .= ' -lperl';
- }
+@@ -947,7 +948,12 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
+ # The Android linker will not recognize symbols from
+ # libperl unless the module explicitly depends on it.
+ $libs .= ' -L$(PERL_INC) -lperl';
+- }
++ } else {
++ if ($ENV{PERL_CORE}) {
++ $libs .= ' -L$(PERL_INC)';
++ }
++ $libs .= ' -lperl';
++ }
}
+ my $ld_run_path_shell = "";
--
-1.8.3.1
+1.8.5.3
diff --git a/ExtUtils-MakeMaker-6.86-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-6.88-USE_MM_LD_RUN_PATH.patch
similarity index 93%
rename from ExtUtils-MakeMaker-6.86-USE_MM_LD_RUN_PATH.patch
rename to ExtUtils-MakeMaker-6.88-USE_MM_LD_RUN_PATH.patch
index 55283da..28af538 100644
--- a/ExtUtils-MakeMaker-6.86-USE_MM_LD_RUN_PATH.patch
+++ b/ExtUtils-MakeMaker-6.88-USE_MM_LD_RUN_PATH.patch
@@ -1,7 +1,7 @@
-From 39185284d33a71596ea3196ad1828a3f64e12482 Mon Sep 17 00:00:00 2001
+From 4c942927842fc4a27515ea1f24ccbc799876bbc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Thu, 12 Jan 2012 17:05:19 +0100
-Subject: [PATCH 1/2] Do not set RPATH by default
+Subject: [PATCH] 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ř <ppisar at redhat.com>
3 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
-index 3ffe3df..e629bf7 100644
+index 3e44628..818630d 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 3ffe3df..e629bf7 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 72d04fb..d78e920 100644
+index 5009a5b..a889217 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
+@@ -951,7 +951,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
}
my $ld_run_path_shell = "";
@@ -49,7 +49,7 @@ index 72d04fb..d78e920 100644
}
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
-index d1bcfe0..df69e94 100644
+index 8d06b42..cc26ecd 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -282,7 +282,7 @@ sub full_setup {
@@ -90,7 +90,7 @@ index d1bcfe0..df69e94 100644
print "MakeMaker (v$VERSION)\n" if $Verbose;
if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){
-@@ -2626,6 +2646,40 @@ precedence. A typemap in the current directory has highest
+@@ -2628,6 +2648,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.
@@ -132,5 +132,5 @@ index d1bcfe0..df69e94 100644
Like PERLPREFIX, but only for the vendor install locations.
--
-1.8.3.1
+1.8.5.3
diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec
index 97bf742..ff1f69d 100644
--- a/perl-ExtUtils-MakeMaker.spec
+++ b/perl-ExtUtils-MakeMaker.spec
@@ -1,5 +1,5 @@
%global cpan_name ExtUtils-MakeMaker
-%global cpan_version 6.86
+%global cpan_version 6.88
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.86-USE_MM_LD_RUN_PATH.patch
+Patch0: %{cpan_name}-6.88-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
+Patch1: %{cpan_name}-6.88-Link-to-libperl-explicitly-on-Linux.patch
BuildArch: noarch
BuildRequires: perl
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib
@@ -122,6 +122,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Mon Feb 03 2014 Petr Pisar <ppisar at redhat.com> - 6.88-1
+- 6.88 bump
+
* Mon Jan 06 2014 Petr Pisar <ppisar at redhat.com> - 6.86-1
- 6.86 bump
diff --git a/sources b/sources
index 1e7544c..c4fd84d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c26d8a0e0a34b3c4a035808c298da697 ExtUtils-MakeMaker-6.86.tar.gz
+e81c391c9b0b4943f85b48c931b717e6 ExtUtils-MakeMaker-6.88.tar.gz
More information about the scm-commits
mailing list