diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-12-28 01:01:49 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-03 12:35:53 +0000 |
commit | 154432841fc576da33606b75cc2790a6e9ab9d0a (patch) | |
tree | 934c43ebe3bb20f972d9ab8396b62d2e60885aa0 | |
parent | dad40851a0e867ee7a7f7da55d1b27fe40a55f4f (diff) | |
download | poky-154432841fc576da33606b75cc2790a6e9ab9d0a.tar.gz |
perl: Fix race issue for cpan/Pod-Simple
Fixed:
Running pm_to_blib for cpan/Pod-Simple directly
[snip]
/path/to/cpan/podlators/../../miniperl "-I../../lib" "-I../../lib" -MExtUtils::MY -e 'MY->fixin(shift)' -- blib/script/pod2man
Can't locate Getopt/Long.pm in @INC [snip]
(From OE-Core rev: bb269bc8e507639dac5a90cce0d71c45216de5e4)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-native_5.24.4.bb b/meta/recipes-devtools/perl/perl-native_5.24.4.bb index 81d3fd4898..fe44d9b8e8 100644 --- a/meta/recipes-devtools/perl/perl-native_5.24.4.bb +++ b/meta/recipes-devtools/perl/perl-native_5.24.4.bb | |||
@@ -17,6 +17,7 @@ SRC_URI += "\ | |||
17 | file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \ | 17 | file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \ |
18 | file://perl-5.26.1-guard_old_libcrypt_fix.patch \ | 18 | file://perl-5.26.1-guard_old_libcrypt_fix.patch \ |
19 | file://0001-ExtUtils-MM_Unix.pm-fix-race-issues.patch \ | 19 | file://0001-ExtUtils-MM_Unix.pm-fix-race-issues.patch \ |
20 | file://0001-Makefile.SH-Pod-Simple-requires-Getopt-Long.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI[md5sum] = "04622bc4d3941dc7eb571c52b7c02993" | 23 | SRC_URI[md5sum] = "04622bc4d3941dc7eb571c52b7c02993" |
diff --git a/meta/recipes-devtools/perl/perl/0001-Makefile.SH-Pod-Simple-requires-Getopt-Long.patch b/meta/recipes-devtools/perl/perl/0001-Makefile.SH-Pod-Simple-requires-Getopt-Long.patch new file mode 100644 index 0000000000..aad46f3e42 --- /dev/null +++ b/meta/recipes-devtools/perl/perl/0001-Makefile.SH-Pod-Simple-requires-Getopt-Long.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 58c69d65b19b5f9a35e1f5ce08d2ea47884233d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 27 Dec 2018 00:18:51 -0800 | ||
4 | Subject: [PATCH] Makefile.SH: Pod-Simple requires Getopt-Long | ||
5 | |||
6 | Fixed a race issue when parallel build: | ||
7 | |||
8 | Running pm_to_blib for cpan/Pod-Simple directly | ||
9 | [snip] | ||
10 | /path/to/cpan/podlators/../../miniperl "-I../../lib" "-I../../lib" -MExtUtils::MY -e 'MY->fixin(shift)' -- blib/script/pod2man | ||
11 | Can't locate Getopt/Long.pm in @INC [snip] | ||
12 | |||
13 | Upstream-Status: Submitted[https://www.nntp.perl.org/group/perl.perl5.porters/2018/12/msg253236.html] | ||
14 | |||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
16 | --- | ||
17 | Makefile.SH | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/Makefile.SH b/Makefile.SH | ||
21 | index 9848d55..7a164e7 100755 | ||
22 | --- a/Makefile.SH | ||
23 | +++ b/Makefile.SH | ||
24 | @@ -189,6 +189,7 @@ dynamic_list=' ' | ||
25 | dynamic_ext_re="lib/auto/re/re.$dlext" | ||
26 | extra_dep=' | ||
27 | ext/Pod-Functions/pm_to_blib: cpan/Pod-Simple/pm_to_blib cpan/Pod-Escapes/pm_to_blib pod/perlfunc.pod | ||
28 | +cpan/Pod-Simple/pm_to_blib: cpan/Getopt-Long/pm_to_blib | ||
29 | ' | ||
30 | for f in $dynamic_ext; do | ||
31 | : the dependency named here will never exist | ||
32 | -- | ||
33 | 2.10.2 | ||
34 | |||
diff --git a/meta/recipes-devtools/perl/perl_5.24.4.bb b/meta/recipes-devtools/perl/perl_5.24.4.bb index a644970192..7b1ae7fec9 100644 --- a/meta/recipes-devtools/perl/perl_5.24.4.bb +++ b/meta/recipes-devtools/perl/perl_5.24.4.bb | |||
@@ -65,6 +65,7 @@ SRC_URI += " \ | |||
65 | file://perl-5.26.1-guard_old_libcrypt_fix.patch \ | 65 | file://perl-5.26.1-guard_old_libcrypt_fix.patch \ |
66 | file://CVE-2018-12015.patch \ | 66 | file://CVE-2018-12015.patch \ |
67 | file://0001-ExtUtils-MM_Unix.pm-fix-race-issues.patch \ | 67 | file://0001-ExtUtils-MM_Unix.pm-fix-race-issues.patch \ |
68 | file://0001-Makefile.SH-Pod-Simple-requires-Getopt-Long.patch \ | ||
68 | " | 69 | " |
69 | 70 | ||
70 | # Fix test case issues | 71 | # Fix test case issues |