Skip to content

Commit

Permalink
perl: update 5.38.2 -> 5.40.0
Browse files Browse the repository at this point in the history
Update rdepends generator to account for new version specifiers
(v{version} instead of just {version}) and exclude a few more
external modules detected at runtime.

Adjust musl configuration to set custom LC_ALL handling
(musl doesn't follow glibc in that, see the last few comments here:
Perl/perl5#22375 ).

Adjust ptest packaging to add a dummy Makefile for 'make perl
releases' test (otherwise the packaging specifically excludes makefiles).

(From OE-Core rev: 1c1cfae53564c836555ace926295cf88109b8c9f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
  • Loading branch information
Alexander Kanavin authored and rpurdie committed Aug 27, 2024
1 parent 38b7bde commit 0c2f303
Show file tree
Hide file tree
Showing 13 changed files with 713 additions and 180 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e8e095b9c71c58f8197d6315359446b6b084cb2b Mon Sep 17 00:00:00 2001
From 47cd22cd213d2c5f28e674b12c264dc731682560 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 5 Jun 2018 14:58:42 +0300
Subject: [PATCH] Somehow this module breaks through the perl wrapper and
Expand All @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 4 insertions(+)

diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 948c476..f537526 100644
index fe38598..0828f52 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -1110,6 +1110,9 @@ WARNING
@@ -1161,6 +1161,9 @@ WARNING
}

foreach my $name (@$names){
Expand All @@ -24,7 +24,7 @@ index 948c476..f537526 100644
my ($abs, $use_dir);
if ($self->file_name_is_absolute($name)) { # /foo/bar
$abs = $name;
@@ -2006,6 +2009,7 @@ sub init_PERL {
@@ -2097,6 +2100,7 @@ sub init_PERL {

$self->{PERL} ||=
$self->find_perl(5.0, \@perls, \@defpath, $Verbose );
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a73fff1fcf0def4ce93964f1b63fe3ad0967259d Mon Sep 17 00:00:00 2001
From 322972384e0795be339252f7cf9a318dc759b51e Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 18 Feb 2022 09:44:26 +0000
Subject: [PATCH] cpan/Sys-Syslog/Makefile.PL: Fix _PATH_LOG for deterministic
Expand Down Expand Up @@ -31,6 +31,3 @@ index d09ba69..d44e58c 100644

# if possible, generate the code that handles the constants with
# ExtUtils::Constant, otherwise use cached copy in fallback/
--
2.31.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 260ebd15e16cd86b9b58e5c5f3a496b3853ca46d Mon Sep 17 00:00:00 2001
From a02355bdc8cde1115daf101675cdfb707d337bf1 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Mon, 17 Jun 2019 10:47:23 -0500
Subject: [PATCH 2/2] Constant: Fix up shebang
Subject: [PATCH] Constant: Fix up shebang

The instructions indicate that the script should be explicitly passed to
"perl -x", so automatically setting the #! to be ^X is unnecessary and
Expand All @@ -15,7 +15,7 @@ Upstream-Status: Submitted [https://rt.cpan.org/Public/Bug/Display.html?id=12986
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm b/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm
index 14eb809714..d4d074e121 100644
index 14eb809..d4d074e 100644
--- a/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm
+++ b/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm
@@ -219,7 +219,7 @@ sub dogfood {
Expand All @@ -27,6 +27,3 @@ index 14eb809714..d4d074e121 100644
use ExtUtils::Constant qw (constant_types C_constant XS_constant);

EOT
--
2.21.0

16 changes: 11 additions & 5 deletions meta/recipes-devtools/perl/files/determinism.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
Fixes to make the perl build reproducible:
From 5c4fd57daf125357262aa796057d7be8e78d378e Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 5 Feb 2020 23:54:02 +0000
Subject: [PATCH] Fixes to make the perl build reproducible:

a) Remove the \n from configure_attr.sh since it gets quoted differently depending on
whether the shell is bash or dash which can cause the test result to be incorrect.
Expand All @@ -20,11 +23,14 @@ RP 2020/2/7

Upstream-Status: Submitted [see links above]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
---
cpan/Encode/Byte/Makefile.PL | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
===================================================================
--- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL
+++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL
diff --git a/cpan/Encode/Byte/Makefile.PL b/cpan/Encode/Byte/Makefile.PL
index 6824bbb..4af4a50 100644
--- a/cpan/Encode/Byte/Makefile.PL
+++ b/cpan/Encode/Byte/Makefile.PL
@@ -171,7 +171,7 @@ sub postamble
my $lengthsofar = length($str);
my $continuator = '';
Expand Down
16 changes: 12 additions & 4 deletions meta/recipes-devtools/perl/files/encodefix.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
From a4e22c7f2a519f24bc8aa89c6677017c0fe13679 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 18 Feb 2020 17:27:26 +0000
Subject: [PATCH] perl: Fix encode module reproducibility issues

The code is encoding host compiler parameters into target builds. Avoid
this for our target builds (patch is target specific, not native)

Upstream-Status: Inappropriate [Cross compile hack]
RP 2020/2/18
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
cpan/Encode/bin/enc2xs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: perl-5.30.1/cpan/Encode/bin/enc2xs
===================================================================
--- perl-5.30.1.orig/cpan/Encode/bin/enc2xs
+++ perl-5.30.1/cpan/Encode/bin/enc2xs
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index 502ae39..7669b05 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -195,7 +195,7 @@ sub compiler_info {
# above becomes false.
my $sized = $declaration && !($compat && !$pedantic);
Expand Down
15 changes: 6 additions & 9 deletions meta/recipes-devtools/perl/files/errno_ver.diff
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8e1efba7560d8d55524c7a0f1b0539ddce419b86 Mon Sep 17 00:00:00 2001
From 9c404d4b1c3607e827fb56b5ae4f8fbbdb52cd0b Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Fri, 16 Dec 2005 01:32:14 +1100
Subject: [PATCH 6/8] Remove Errno version check due to upgrade problems with
Subject: [PATCH] Remove Errno version check due to upgrade problems with
long-running processes.

Bug-Debian: http://bugs.debian.org/343351
Expand All @@ -17,21 +17,18 @@ Upstream-Status: Pending
1 file changed, 5 deletions(-)

diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
index 6251a3c..eeed445 100644
index 77aa19b..4bdbef1 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
@@ -294,11 +294,6 @@ EDQ
@@ -295,11 +295,6 @@ EDQ
# they've already declared perl doesn't need to worry about this risk.
if(!$ENV{'PERL_BUILD_EXPAND_CONFIG_VARS'}) {
print <<"CONFIG_CHECK_END";
-use Config;
-"\$Config{'archname'}-\$Config{'osvers'}" eq
-"$archname-$Config{'osvers'}" or
- die "Errno architecture ($archname-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
-"$archname-$osvers" or
- die "Errno architecture ($archname-$osvers) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
-
CONFIG_CHECK_END
}

--
2.1.4

18 changes: 13 additions & 5 deletions meta/recipes-devtools/perl/files/native-perlinc.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
From 9fec62b19a49d1451fd1120c5dc38baf59f73856 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 30 May 2007 09:33:32 +0000
Subject: [PATCH] perl: sync with OE

Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 13 +++++++++++++
1 file changed, 13 insertions(+)

Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm
===================================================================
--- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2008-10-31 22:01:35.000000000 +0000
+++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2008-10-31 22:01:35.000000000 +0000
@@ -1597,6 +1597,19 @@
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 0828f52..b8abff4 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -1862,6 +1862,19 @@ from the perl source tree.
$self->{PERL_LIB} ||= $Config{privlibexp};
$self->{PERL_ARCHLIB} ||= $Config{archlibexp};
$self->{PERL_INC} = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now
Expand Down
3 changes: 1 addition & 2 deletions meta/recipes-devtools/perl/files/perl-configpm-switch.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c25d460a2f00e9af25087d40447fe1a81c89710c Mon Sep 17 00:00:00 2001
From 7a48538a7e8614a3342151b646d2105c0cb0cdd9 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Sun, 27 May 2007 21:04:11 +0000
Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)
Expand All @@ -14,7 +14,6 @@ values would be valid for the host only.

Upstream-Status: Inappropriate [native]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>

---
configpm | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
Expand Down
18 changes: 13 additions & 5 deletions meta/recipes-devtools/perl/files/perl-dynloader.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
From 25a26c52c320e699b37a7ad1f4f045bc8aa4cb00 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sun, 27 May 2007 21:04:11 +0000
Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)

Upstream-Status: Inappropriate [embedded specific]

Allow the location that .so files are searched for for dynamic
Expand All @@ -6,12 +11,15 @@ us to load .so's from the host system while building for the target
system.

Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
---
dist/XSLoader/XSLoader_pm.PL | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)

Index: perl-5.24.1/dist/XSLoader/XSLoader_pm.PL
===================================================================
--- perl-5.24.1.orig/dist/XSLoader/XSLoader_pm.PL
+++ perl-5.24.1/dist/XSLoader/XSLoader_pm.PL
@@ -52,6 +52,24 @@ sub load {
diff --git a/dist/XSLoader/XSLoader_pm.PL b/dist/XSLoader/XSLoader_pm.PL
index ff5ca31..0d50803 100644
--- a/dist/XSLoader/XSLoader_pm.PL
+++ b/dist/XSLoader/XSLoader_pm.PL
@@ -32,6 +32,24 @@ sub load {
my ($caller, $modlibname) = caller();
my $module = $caller;

Expand Down
Loading

0 comments on commit 0c2f303

Please # to comment.