Rebase patches
This prevents from creating back-up files with stricter patch.
This commit is contained in:
Petr Písař
parent
11ae9cb3db
commit
7e4f6c0c91
|
|
@ -1,4 +1,4 @@
|
|||
From c2fc4b379565552ba6c82553ceceb7d4cd754cc5 Mon Sep 17 00:00:00 2001
|
||||
From 4a4f7dd3d3e7877aa45081311c1a32421e0d32e4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Tue, 2 Jul 2013 10:28:15 +0200
|
||||
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(-)
|
||||
|
||||
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
|
||||
index 25a1778..fcd130a 100644
|
||||
index 198f05e..d9ebe61 100644
|
||||
--- a/lib/ExtUtils/MM_Unix.pm
|
||||
+++ b/lib/ExtUtils/MM_Unix.pm
|
||||
@@ -30,6 +30,7 @@ BEGIN {
|
||||
|
|
@ -26,7 +26,7 @@ index 25a1778..fcd130a 100644
|
|||
$Is{SunOS4} = $^O eq 'sunos';
|
||||
$Is{Solaris} = $^O eq 'solaris';
|
||||
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
|
||||
@@ -1022,7 +1023,7 @@ sub xs_make_dynamic_lib {
|
||||
@@ -1028,7 +1029,7 @@ sub xs_make_dynamic_lib {
|
||||
push(@m," \$(RM_F) \$\@\n");
|
||||
|
||||
my $libs = '$(LDLOADLIBS)';
|
||||
|
|
@ -35,7 +35,7 @@ index 25a1778..fcd130a 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
|
||||
@@ -1035,6 +1036,11 @@ sub xs_make_dynamic_lib {
|
||||
@@ -1041,6 +1042,11 @@ sub xs_make_dynamic_lib {
|
||||
# The Android linker will not recognize symbols from
|
||||
# libperl unless the module explicitly depends on it.
|
||||
$libs .= ' "-L$(PERL_INC)" -lperl';
|
||||
|
|
@ -48,5 +48,5 @@ index 25a1778..fcd130a 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.5.5
|
||||
2.13.6
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 4361bd6fb0717f99f6b21ed053542e01c5093af2 Mon Sep 17 00:00:00 2001
|
||||
From 83b4921f10f9df96ec359e20489864080f7b37ca Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Thu, 12 Jan 2012 17:05:19 +0100
|
||||
Subject: [PATCH] Do not set RPATH by default
|
||||
|
|
@ -20,7 +20,7 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|||
3 files changed, 61 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
|
||||
index 6e1224c..5573ff6 100644
|
||||
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
|
||||
|
|
@ -36,10 +36,10 @@ index 6e1224c..5573ff6 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 c5ddaac..d2fbb31 100644
|
||||
index 6233513..198f05e 100644
|
||||
--- a/lib/ExtUtils/MM_Unix.pm
|
||||
+++ b/lib/ExtUtils/MM_Unix.pm
|
||||
@@ -1039,7 +1039,7 @@ sub xs_make_dynamic_lib {
|
||||
@@ -1045,7 +1045,7 @@ sub xs_make_dynamic_lib {
|
||||
}
|
||||
|
||||
my $ld_run_path_shell = "";
|
||||
|
|
@ -49,10 +49,10 @@ index c5ddaac..d2fbb31 100644
|
|||
}
|
||||
|
||||
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
|
||||
index fc1b1e6..89d7ca8 100644
|
||||
index 3d4913e..b52c96d 100644
|
||||
--- a/lib/ExtUtils/MakeMaker.pm
|
||||
+++ b/lib/ExtUtils/MakeMaker.pm
|
||||
@@ -313,7 +313,7 @@ sub full_setup {
|
||||
@@ -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
|
||||
|
|
@ -61,7 +61,7 @@ index fc1b1e6..89d7ca8 100644
|
|||
XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION
|
||||
clean depend dist dynamic_lib linkext macro realclean tool_autosplit
|
||||
|
||||
@@ -499,6 +499,26 @@ sub new {
|
||||
@@ -503,6 +503,26 @@ sub new {
|
||||
$self->_PRINT_PREREQ;
|
||||
}
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ index fc1b1e6..89d7ca8 100644
|
|||
print "MakeMaker (v$VERSION)\n" if $Verbose;
|
||||
if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
|
||||
check_manifest();
|
||||
@@ -2781,6 +2801,40 @@ precedence. A typemap in the current directory has highest
|
||||
@@ -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.
|
||||
|
||||
|
|
@ -130,5 +130,5 @@ index fc1b1e6..89d7ca8 100644
|
|||
|
||||
Like PERLPREFIX, but only for the vendor install locations.
|
||||
--
|
||||
2.5.5
|
||||
2.13.6
|
||||
|
||||
|
|
@ -3,16 +3,16 @@
|
|||
Name: perl-%{cpan_name}
|
||||
Epoch: 1
|
||||
Version: 7.30
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Create a module Makefile
|
||||
License: GPL+ or Artistic
|
||||
URL: http://search.cpan.org/dist/%{cpan_name}/
|
||||
Source0: http://www.cpan.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.16-USE_MM_LD_RUN_PATH.patch
|
||||
Patch0: %{cpan_name}-7.30-USE_MM_LD_RUN_PATH.patch
|
||||
# Link to libperl.so explicitly. Bug #960048.
|
||||
Patch1: %{cpan_name}-7.12-Link-to-libperl-explicitly-on-Linux.patch
|
||||
Patch1: %{cpan_name}-7.30-Link-to-libperl-explicitly-on-Linux.patch
|
||||
# Unbundle version modules
|
||||
Patch2: %{cpan_name}-7.04-Unbundle-version.patch
|
||||
# Unbundle Encode::Locale module
|
||||
|
|
@ -204,6 +204,9 @@ make test
|
|||
%{_mandir}/man3/ExtUtils::MM::Utils.*
|
||||
|
||||
%changelog
|
||||
* Mon Dec 18 2017 Petr Pisar <ppisar@redhat.com> - 1:7.30-3
|
||||
- Rebase patches
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.30-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue