summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-04-25 19:28:07 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-29 15:02:18 +0100
commit3c2e77b186e857acedd749bda40baa713b7c2742 (patch)
tree5291f7715f033ecb9cff8b104587ab83d717b01c /meta
parent2e11d97b6c95e89aa1f9d3603a966c94c442469e (diff)
downloadpoky-3c2e77b186e857acedd749bda40baa713b7c2742.tar.gz
perl: update to 5.30.2
racefix.patch was merged to perl-cross determinism.patch was partially merged to perl-cross 0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch is no longer needed as issue is addressed upstream. (From OE-Core rev: d263537bc0a0ad8736dea5e49b93188b123d4a9f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch27
-rw-r--r--meta/recipes-devtools/perl/files/determinism.patch13
-rw-r--r--meta/recipes-devtools/perl/files/racefix.patch24
-rw-r--r--meta/recipes-devtools/perl/perl_5.30.2.bb (renamed from meta/recipes-devtools/perl/perl_5.30.1.bb)10
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 @@
1From b0d53cfd785f64002128ac5eecc4aed0663d9c30 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 9 Jan 2020 17:26:55 +0100
4Subject: [PATCH] tests: adjust to correctly exclude unbuilt extensions
5
6Issue is reported here:
7https://github.com/arsv/perl-cross/issues/85
8
9Upstream-Status: Inappropriate [issue caused by perl-cross]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 t/TEST | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/t/TEST b/t/TEST
16index a9c844f..8d3505f 100755
17--- a/t/TEST
18+++ b/t/TEST
19@@ -419,7 +419,7 @@ sub _tests_from_manifest {
20 while (<MANI>) {
21 if (m!^((?:cpan|dist|ext)/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
22 my $t = $1;
23- my $extension = $2;
24+ my $extension = $1."/".$2;
25
26 # XXX Generates way too many error lines currently. Skip for
27 # 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
21Upstream-Status: Pending [75% submitted] 21Upstream-Status: Pending [75% submitted]
22Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org 22Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
23 23
24Index: perl-5.30.1/cnf/configure_attr.sh
25===================================================================
26--- perl-5.30.1.orig/cnf/configure_attr.sh
27+++ perl-5.30.1/cnf/configure_attr.sh
28@@ -131,7 +131,7 @@ if not hinted d_c99_variadic_macros 'sup
29 try_start
30 try_add '#include <stdio.h>'
31 try_add '#define foo(fmt, ...) printf(fmt, __VA_ARGS__)'
32- try_add 'int main(void) { foo("%i\n", 1234); return 0; }'
33+ try_add 'int main(void) { foo("%i", 1234); return 0; }'
34 try_compile
35 resdef d_c99_variadic_macros 'supported' 'missing'
36 fi
37Index: perl-5.30.1/cnf/configure_mods.sh 24Index: perl-5.30.1/cnf/configure_mods.sh
38=================================================================== 25===================================================================
39--- perl-5.30.1.orig/cnf/configure_mods.sh 26--- 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 @@
1In our builds Config_heavy.pl sometimes has lines:
2cwarnflags=XXX
3ccstdflags=XXX
4and sometimes does not.
5The reason is that this information is pulled from cflags by configpm and yet
6there is no dependency in the Makefile. Add one to fix this.
7
8Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/89]
9RP 2020/2/19
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: perl-5.30.1/Makefile
13===================================================================
14--- perl-5.30.1.orig/Makefile
15+++ perl-5.30.1/Makefile
16@@ -204,7 +204,7 @@ configpod: $(CONFIGPOD)
17 git_version.h lib/Config_git.pl: make_patchnum.pl | miniperl$X
18 ./miniperl_top make_patchnum.pl
19
20-lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh \
21+lib/Config.pm lib/Config_heavy.pl lib/Config.pod: config.sh cflags \
22 lib/Config_git.pl Porting/Glossary | miniperl$X
23 ./miniperl_top configpm
24
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 \
8 8
9 9
10SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ 10SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
11 https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.tar.gz;name=perl-cross \ 11 https://github.com/arsv/perl-cross/releases/download/1.3.2/perl-cross-1.3.2.tar.gz;name=perl-cross \
12 file://perl-rdepends.txt \ 12 file://perl-rdepends.txt \
13 file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ 13 file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
14 file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ 14 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 \
20 file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ 20 file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \
21 file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ 21 file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \
22 file://0002-Constant-Fix-up-shebang.patch \ 22 file://0002-Constant-Fix-up-shebang.patch \
23 file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \
24 file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ 23 file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \
25 file://determinism.patch \ 24 file://determinism.patch \
26 file://racefix.patch \
27 " 25 "
28SRC_URI_append_class-native = " \ 26SRC_URI_append_class-native = " \
29 file://perl-configpm-switch.patch \ 27 file://perl-configpm-switch.patch \
@@ -32,10 +30,8 @@ SRC_URI_append_class-target = " \
32 file://encodefix.patch \ 30 file://encodefix.patch \
33" 31"
34 32
35SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" 33SRC_URI[perl.sha256sum] = "66db7df8a91979eb576fac91743644da878244cf8ee152f02cd6f5cd7a731689"
36SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" 34SRC_URI[perl-cross.sha256sum] = "defa12f0ad7be0b6c48b4f76e2fb5b37c1b37fbeb6e9ebe938279cd539a0c20c"
37SRC_URI[perl-cross.md5sum] = "1e463b105cfa56d251a86979af23e3a7"
38SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d"
39 35
40S = "${WORKDIR}/perl-${PV}" 36S = "${WORKDIR}/perl-${PV}"
41 37