4 files changed, 3 insertions, 71 deletions

diff --git a/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch b/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch
deleted file mode 100644
index 0f3a2c6327..0000000000
--- a/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b0d53cfd785f64002128ac5eecc4aed0663d9c30 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 9 Jan 2020 17:26:55 +0100
-Subject: [PATCH] tests: adjust to correctly exclude unbuilt extensions
-
-Issue is reported here:
-https://github.com/arsv/perl-cross/issues/85
-
-Upstream-Status: Inappropriate [issue caused by perl-cross]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- t/TEST | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/TEST b/t/TEST
-index a9c844f..8d3505f 100755
---- a/t/TEST
-+++ b/t/TEST
-@@ -419,7 +419,7 @@ sub _tests_from_manifest {
-        while (<MANI>) {
-            if (m!^((?:cpan|dist|ext)/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
-                my $t = $1;
--               my $extension = $2;
-+               my $extension = $1."/".$2;
- 
-                # XXX Generates way too many error lines currently.  Skip for
-                # v5.22
diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch
index ed4d06f5ec..ccdd52a0d0 100644
--- a/meta/recipes-devtools/perl/files/determinism.patch
+++ b/meta/recipes-devtools/perl/files/determinism.patch
@@ -21,19 +21,6 @@ RP 2020/2/7
 Upstream-Status: Pending [75% submitted]
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
 
-Index: perl-5.30.1/cnf/configure_attr.sh
-===================================================================
---- perl-5.30.1.orig/cnf/configure_attr.sh
-+++ perl-5.30.1/cnf/configure_attr.sh
-@@ -131,7 +131,7 @@ if not hinted d_c99_variadic_macros 'sup
-        try_start
-        try_add '#include <stdio.h>'
-        try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)'
--       try_add 'int main(void) { foo("%i\n", 1234); return 0; }'
-+       try_add 'int main(void) { foo("%i", 1234); return 0; }'
-        try_compile
-        resdef d_c99_variadic_macros 'supported' 'missing'
- fi
 Index: perl-5.30.1/cnf/configure_mods.sh
 ===================================================================
 --- perl-5.30.1.orig/cnf/configure_mods.sh
diff --git a/meta/recipes-devtools/perl/files/racefix.patch b/meta/recipes-devtools/perl/files/racefix.patch
deleted file mode 100644
index bac42d26ae..0000000000
--- a/meta/recipes-devtools/perl/files/racefix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-In our builds Config_heavy.pl sometimes has lines:
-cwarnflags=XXX
-ccstdflags=XXX
-and sometimes does not.
-The reason is that this information is pulled from cflags by configpm and yet
-there is no dependency in the Makefile. Add one to fix this.
-
-Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89]
-RP 2020/2/19
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Index: perl-5.30.1/Makefile
-===================================================================
---- perl-5.30.1.orig/Makefile
-+++ perl-5.30.1/Makefile
-@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD)
- git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X
-        ./miniperl_top make_patchnum.pl
- 
--lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \
-+lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \
-                lib/Config_git.pl Porting/Glossary | miniperl$X
-        ./miniperl_top configpm
- 
diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.2.bb
index 9d747aa5b4..778c420b2e 100644
--- a/meta/recipes-devtools/perl/perl_5.30.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.30.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-           https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.tar.gz;name=perl-cross \
+           https://github.com/arsv/perl-cross/releases/download/1.3.2/perl-cross-1.3.2.tar.gz;name=perl-cross \
            file://perl-rdepends.txt \
            file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
            file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -20,10 +20,8 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
            file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
            file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \
            file://0002-Constant-Fix-up-shebang.patch \
-           file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \
            file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \
            file://determinism.patch  \
-           file://racefix.patch \
            "
 SRC_URI_append_class-native = " \
            file://perl-configpm-switch.patch \
@@ -32,10 +30,8 @@ SRC_URI_append_class-target = " \
            file://encodefix.patch \
 "
 
-SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46"
-SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964"
-SRC_URI[perl-cross.md5sum] = "1e463b105cfa56d251a86979af23e3a7"
-SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d"
+SRC_URI[perl.sha256sum] = "66db7df8a91979eb576fac91743644da878244cf8ee152f02cd6f5cd7a731689"
+SRC_URI[perl-cross.sha256sum] = "defa12f0ad7be0b6c48b4f76e2fb5b37c1b37fbeb6e9ebe938279cd539a0c20c"
 
 S = "${WORKDIR}/perl-${PV}"