Skip to content

Commit

Permalink
Update patches / targets for perl 5.32.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kentfredric committed Aug 7, 2020
1 parent 1d269ea commit d49ab17
Show file tree
Hide file tree
Showing 31 changed files with 161 additions and 182 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ before_install:
install:
- source travis-utils/emsg.sh
- source travis-utils/env-setup.sh
- export TARGET_PERL=https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/perl-5.30.3.tar.xz
- export TARGET_PERL=https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/perl-5.32.0.tar.xz
- source travis-utils/get_perl.sh
- tar -xf /tmp/perl.tar.xz --strip-components 1 -C ${S}
script:
Expand Down
6 changes: 3 additions & 3 deletions patches/0001-Fix-hpux-hints.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 043e1e2761e650177fbafa873c226354b3f17146 Mon Sep 17 00:00:00 2001
From b7cfc47c1f4a7c93a8e750d069a46d171f20db24 Mon Sep 17 00:00:00 2001
From: Torsten Veller <[email protected]>
Date: Sun, 15 Apr 2012 09:27:19 +0200
Subject: [PATCH 01/30] Fix hpux hints
Expand All @@ -12,7 +12,7 @@ Patch-Name: gentoo/hints_hpux.diff
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hints/hpux.sh b/hints/hpux.sh
index d224ceef1d..8ef7a3d1d6 100644
index da5f81dfe1..3626f4fc25 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -190,7 +190,7 @@ case "$ccisgcc" in
Expand Down Expand Up @@ -51,5 +51,5 @@ index d224ceef1d..8ef7a3d1d6 100644
*-g*-O*|*-O*-g*)
# gcc without gas will not accept -g
--
2.27.0
2.28.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1e0213aaaa2835a3d0b472f7ddf7013daa2338f0 Mon Sep 17 00:00:00 2001
From 095ac921320cd9d1fb7fc1d2cfe11f1706de710e Mon Sep 17 00:00:00 2001
From: Torsten Veller <[email protected]>
Date: Sun, 15 Apr 2012 08:56:44 +0200
Subject: [PATCH 02/30] aix gcc detection and shared library soname support
Expand All @@ -19,7 +19,7 @@ Patch-Name: gentoo/aix_soname.diff
1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/Makefile.SH b/Makefile.SH
index fe3b99aea3..8774f291c8 100755
index f77f170a0c..e6098560dc 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -94,12 +94,12 @@ true)
Expand Down Expand Up @@ -54,7 +54,7 @@ index fe3b99aea3..8774f291c8 100755
;;
esac
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
@@ -934,11 +934,19 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLEXPORT)
@@ -936,11 +936,19 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLEXPORT)
!NO!SUBS!
case "$osname" in
aix)
Expand All @@ -80,5 +80,5 @@ index fe3b99aea3..8774f291c8 100755
esac
;;
--
2.27.0
2.28.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3d4fea89df2d4bc74b89a88e8686eac951438cb8 Mon Sep 17 00:00:00 2001
From e19b4e54855ca3f15831737d632d9893476605a5 Mon Sep 17 00:00:00 2001
From: Torsten Veller <[email protected]>
Date: Sat, 14 Apr 2012 13:16:34 +0200
Subject: [PATCH 03/30] cpan/ExtUtils-MakeMaker: drop $PORTAGE_TMPDIR from
Expand All @@ -12,10 +12,10 @@ Patch-Name: gentoo/EUMM-RUNPATH.diff
1 file changed, 7 insertions(+)

diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
index 1a3893c30b..bb15cda771 100644
index 4f4b252c26..98ac803399 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
@@ -2435,6 +2435,13 @@ sub init_others {
@@ -2437,6 +2437,13 @@ sub init_others {
# LD_RUN_PATH now computed by ExtUtils::Liblist
($self->{EXTRALIBS}, $self->{BSLOADLIBS},
$self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
Expand All @@ -30,5 +30,5 @@ index 1a3893c30b..bb15cda771 100644
}
}
--
2.27.0
2.28.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f846b901099c258dd9377916939a9987d5c1debd Mon Sep 17 00:00:00 2001
From 9d9ced346c46bf2a24e88ec869ed2d74b44dc73d Mon Sep 17 00:00:00 2001
From: Torsten Veller <[email protected]>
Date: Sat, 14 Apr 2012 13:31:17 +0200
Subject: [PATCH 04/30] Remove -rpath and append LDFLAGS to lddlflags
Expand Down Expand Up @@ -27,5 +27,5 @@ index 0000000000..4cba549b1d
+ccdlflags="$tmp"
+lddlflags="$lddlflags $LDFLAGS"
--
2.27.0
2.28.0

8 changes: 4 additions & 4 deletions patches/0005-Add-headers-for-opensolaris.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 67bd66a3efd873cf55a4c82b33905060e790ece4 Mon Sep 17 00:00:00 2001
From 3db733a0e0d0a70c7e5ffa6eae999b8a68dc538c Mon Sep 17 00:00:00 2001
From: Vladimir Smirnov <[email protected]>
Date: Mon, 19 May 2014 19:50:12 +0400
Subject: [PATCH 05/30] Add headers for opensolaris
Expand All @@ -13,10 +13,10 @@ Original-By: Torsten Veller <[email protected]>
1 file changed, 2 insertions(+)

diff --git a/perl.h b/perl.h
index e5a55850f1..7064ade521 100644
index 08d5e786f3..c6e9acf5d0 100644
--- a/perl.h
+++ b/perl.h
@@ -1436,6 +1436,8 @@ EXTERN_C char *crypt(const char *, const char *);
@@ -1637,6 +1637,8 @@ any magic.
*/

#if defined(I_SYSMODE)
Expand All @@ -26,5 +26,5 @@ index e5a55850f1..7064ade521 100644
#endif

--
2.27.0
2.28.0

6 changes: 3 additions & 3 deletions patches/0006-List-packaged-patches-in-patchlevel.h.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From cb5572c436b231b0d4608568a9eafbba95ae9831 Mon Sep 17 00:00:00 2001
From dbe561b33ffc4a293552f31c226cc9f503d8d0de Mon Sep 17 00:00:00 2001
From: Torsten Veller <[email protected]>
Date: Sat, 14 Apr 2012 18:11:54 +0200
Subject: [PATCH 06/30] List packaged patches in patchlevel.h
Expand All @@ -16,7 +16,7 @@ Patch-Name: gentoo/patchlevel.diff
1 file changed, 1 insertion(+)

diff --git a/patchlevel.h b/patchlevel.h
index d55a9c7ad9..a8f50e809d 100644
index dea542dc44..84e0157ad3 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -137,6 +137,7 @@ static const char * const local_patches[] = {
Expand All @@ -28,5 +28,5 @@ index d55a9c7ad9..a8f50e809d 100644
};

--
2.27.0
2.28.0

8 changes: 4 additions & 4 deletions patches/0007-Cleanup-PATH-and-shrpenv.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 02338db33c0c284fd61bf417948efdd788de6588 Mon Sep 17 00:00:00 2001
From 13602c6bbb20fe0e3b04c793a1f9773dd6b7e386 Mon Sep 17 00:00:00 2001
From: Vladimir Smirnov <[email protected]>
Date: Mon, 19 May 2014 19:54:51 +0400
Subject: [PATCH 07/30] Cleanup PATH and shrpenv
Expand All @@ -13,7 +13,7 @@ Original-By: Torsten Veller <[email protected]>
1 file changed, 73 deletions(-)

diff --git a/Configure b/Configure
index 3464d4284c..768eea887c 100755
index cef8c3c078..7a113f5246 100755
--- a/Configure
+++ b/Configure
@@ -107,28 +107,6 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th
Expand Down Expand Up @@ -45,7 +45,7 @@ index 3464d4284c..768eea887c 100755
: shall we be using ksh?
inksh=''
needksh=''
@@ -8795,57 +8773,6 @@ EOM
@@ -8807,57 +8785,6 @@ EOM
;;
esac

Expand Down Expand Up @@ -104,5 +104,5 @@ index 3464d4284c..768eea887c 100755
# (For building Perl itself bare -bE:perl.exp is needed,
# Makefile.SH takes care of this.)
--
2.27.0
2.28.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From cfd499f78fd79c4cb292935d557a91d48fbc99a5 Mon Sep 17 00:00:00 2001
From f9de53d79be02de41a63c7a8ce691dde63684136 Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <[email protected]>
Date: Tue, 8 Mar 2005 19:30:38 +1100
Subject: [PATCH 08/30] Tweak enc2xs to follow symlinks and ignore missing @INC
Expand All @@ -17,10 +17,10 @@ Patch-Name: debian/enc2xs_inc.diff
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index 619b64b757..050c863ef9 100644
index 1209baa9cd..8571d64b3a 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -1013,11 +1013,11 @@ use vars qw(
@@ -997,11 +997,11 @@ use vars qw(
sub find_e2x{
eval { require File::Find; };
my (@inc, %e2x_dir);
Expand All @@ -34,7 +34,7 @@ index 619b64b757..050c863ef9 100644
my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
$atime,$mtime,$ctime,$blksize,$blocks)
= lstat($_) or return;
@@ -1027,7 +1027,7 @@ sub find_e2x{
@@ -1011,7 +1011,7 @@ sub find_e2x{
$e2x_dir{$File::Find::dir} ||= $mtime;
}
return;
Expand All @@ -43,7 +43,7 @@ index 619b64b757..050c863ef9 100644
warn join("\n", keys %e2x_dir), "\n";
for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
$_E2X = $d;
@@ -1091,7 +1091,7 @@ sub make_configlocal_pm {
@@ -1075,7 +1075,7 @@ sub make_configlocal_pm {
$LocalMod{$enc} ||= $mod;
}
};
Expand All @@ -53,5 +53,5 @@ index 619b64b757..050c863ef9 100644
for my $enc ( sort keys %LocalMod ) {
$_ModLines .=
--
2.27.0
2.28.0

4 changes: 2 additions & 2 deletions patches/0009-darwin-Use-CC-to-link.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ea285878e45eb49fdc0e24f898ed0671129a4e96 Mon Sep 17 00:00:00 2001
From be6de0d5ce98bb6717668a23a138d57ec0a1e91e Mon Sep 17 00:00:00 2001
From: Vladimir Smirnov <[email protected]>
Date: Mon, 19 May 2014 19:59:52 +0400
Subject: [PATCH 09/30] darwin: Use $CC to link
Expand Down Expand Up @@ -38,5 +38,5 @@ index 0a91bc083c..71dcb439ba 100644
# set the ld to be that explicitly something else. Conversely,
# if the cc is 'cc' (or empty), set the ld to be 'cc'.
--
2.27.0
2.28.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d3c2bf81faa3c9ca7f410c891de203e52c7e3390 Mon Sep 17 00:00:00 2001
From 69f1c3cf97a54964d86a2ff47cd10a42de91def3 Mon Sep 17 00:00:00 2001
From: Torsten Veller <[email protected]>
Date: Sat, 14 Apr 2012 13:34:20 +0200
Subject: [PATCH 10/30] Provide a sensible INSTALLDIRS default for modules
Expand All @@ -15,10 +15,10 @@ Patch-Name: gentoo/cpan_definstalldirs.diff
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
index 49fa8ab7b9..cdf1dc220d 100644
index af4a6d7759..b7322fd16f 100644
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
@@ -1033,7 +1033,7 @@ sub init {
@@ -1080,7 +1080,7 @@ sub init {
my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');

if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
Expand All @@ -27,7 +27,7 @@ index 49fa8ab7b9..cdf1dc220d 100644
my_dflt_prompt(make_arg => "", $matcher);
if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
$CPAN::Frontend->mywarn(
@@ -1065,7 +1065,7 @@ sub init {
@@ -1112,7 +1112,7 @@ sub init {
my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
$matcher);

Expand All @@ -37,5 +37,5 @@ index 49fa8ab7b9..cdf1dc220d 100644

if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command}
--
2.27.0
2.28.0

4 changes: 2 additions & 2 deletions patches/0011-Fix-interix-hints.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7fde95ad18572a2100e474242e342f7e56443f54 Mon Sep 17 00:00:00 2001
From 5b4e5e2dac57c0013c14da4438b4a38f36e57d20 Mon Sep 17 00:00:00 2001
From: Vladimir Smirnov <[email protected]>
Date: Mon, 19 May 2014 20:01:41 +0400
Subject: [PATCH 11/30] Fix interix hints
Expand Down Expand Up @@ -32,5 +32,5 @@ index acbf9c7d1e..c9e3334c6b 100644
case "$plibpth" in
'') plibpth=`LANG=C LC_ALL=C $cc -print-search-dirs | grep libraries |
--
2.27.0
2.28.0

6 changes: 3 additions & 3 deletions patches/0012-Set-libperl-soname.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0e022e4750517a47c34f64d78524a6eb84d708a6 Mon Sep 17 00:00:00 2001
From ad9b7384f1af06007f8549a90c2eb4a6ffd9ddf1 Mon Sep 17 00:00:00 2001
From: Vladimir Smirnov <[email protected]>
Date: Mon, 19 May 2014 19:41:49 +0400
Subject: [PATCH 12/30] Set libperl soname
Expand All @@ -14,7 +14,7 @@ Ported to Perl 5.28.2 dilfridge
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.SH b/Makefile.SH
index 8774f291c8..d90b71bf66 100755
index e6098560dc..69f1c4dc05 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -70,11 +70,11 @@ true)
Expand Down Expand Up @@ -60,5 +60,5 @@ index 8774f291c8..d90b71bf66 100755
case "$ldlibpthname" in
'') ;;
--
2.27.0
2.28.0

8 changes: 4 additions & 4 deletions patches/0013-Add-etc-perl-to-INC.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 44e7c6984fe301b9d4190420a25d9c1ad9aba12c Mon Sep 17 00:00:00 2001
From 8c89924ac97d023b6d1a05a2b79295c9284e6b90 Mon Sep 17 00:00:00 2001
From: Torsten Veller <[email protected]>
Date: Sat, 14 Apr 2012 13:59:56 +0200
Subject: [PATCH 13/30] Add /etc/perl to @INC
Expand All @@ -9,10 +9,10 @@ Patch-Name: gentoo/mod_paths.diff
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/perl.c b/perl.c
index 5cf250aecf..14cdaac1b1 100644
index 2013a76026..0669cb41e6 100644
--- a/perl.c
+++ b/perl.c
@@ -4697,17 +4697,21 @@ S_init_perllib(pTHX)
@@ -4743,17 +4743,21 @@ S_init_perllib(pTHX)
SITEARCH, SITELIB, VENDORARCH, VENDORLIB, ARCHLIB and PRIVLIB
*/
INCPUSH_APPLLIB_EXP
Expand All @@ -37,5 +37,5 @@ index 5cf250aecf..14cdaac1b1 100644

#endif /* !PERL_IS_MINIPERL */
--
2.27.0
2.28.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f50381c37afd4de051b92b4de90e9fa2736c2cef Mon Sep 17 00:00:00 2001
From 42427b9bd5c295c95cfe12fa3647a7ca9d068c3a Mon Sep 17 00:00:00 2001
From: Kent Fredric <[email protected]>
Date: Sun, 22 Jan 2017 18:58:49 +1300
Subject: [PATCH 14/30] cpan/ExtUtils-MakeMaker: remove targets that generate
Expand All @@ -9,10 +9,10 @@ Subject: [PATCH 14/30] cpan/ExtUtils-MakeMaker: remove targets that generate
1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index fe53be12ef..0086e4fd55 100644
index ce1292740f..0444745922 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2298,16 +2298,6 @@ doc_vendor_install :: all
@@ -2379,16 +2379,6 @@ doc_vendor_install :: all

push @m, q{
doc_perl_install :: all
Expand All @@ -29,7 +29,7 @@ index fe53be12ef..0086e4fd55 100644
doc_site_install :: all
$(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
-$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
@@ -2317,19 +2307,9 @@ doc_site_install :: all
@@ -2398,19 +2388,9 @@ doc_site_install :: all
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
Expand All @@ -51,5 +51,5 @@ index fe53be12ef..0086e4fd55 100644

push @m, q{
--
2.27.0
2.28.0

Loading

0 comments on commit d49ab17

Please sign in to comment.