summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-devtools/perl/perl/perl-fix-conflict-between-skip_all-and-END.patch181
-rw-r--r--meta/recipes-devtools/perl/perl/perl-test-customized.patch61
-rw-r--r--meta/recipes-devtools/perl/perl_5.22.1.bb2
3 files changed, 244 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/perl-fix-conflict-between-skip_all-and-END.patch b/meta/recipes-devtools/perl/perl/perl-fix-conflict-between-skip_all-and-END.patch
new file mode 100644
index 0000000000..de946dbec7
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/perl-fix-conflict-between-skip_all-and-END.patch
@@ -0,0 +1,181 @@
1Some Perl tests fail when run on a cross-compiled target machine. Apply
2a slightly tweaked upstream patch to fix the problems. Notes:
3 1. as of 2 Jun 2016, the original patch has been applied to the current
4 EUMM releases, but has not made it into perl core yet.
5 2. when the base perl package is upgraded in Yocto, this patch may need
6 to be replaced by the original upstream version to correctly apply
7 to the current version of ExtUtils-MakeMaker at that time.
8
9[YOCTO #8656]
10
11Upstream-Status: Backport
12
13Signed-off-by: Bill Randle <william.c.randle@intel.com>
14
15From 4a07a3bd18363986112cf2b39dec3c2985353ffb Mon Sep 17 00:00:00 2001
16From: Francois Perrad <francois.perrad@gadz.org>
17Date: Mon, 22 Dec 2014 19:04:34 +0100
18Subject: [PATCH] fix conflict between skip_all and END section
19
20since the commit 430de781809a6be3bcd25a349dc40ce54405ab53
21the test suite fails in cross-compil environment (perl-5.21.6 & perl-5.21.7)
22like this :
23
24 $ ./perl harness -v ../cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t
25 ../cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t ..
26 1..0 # SKIP cross-compiling and make not available
27 ok 1 - chdir updir
28 ok 2 - teardown
29 # Looks like you planned 0 tests but ran 2.
30 skipped: cross-compiling and make not available
31
32this commit restores the implicit call of plan() at import time of Test::More
33
34Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
35---
36 cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t | 7 ++++---
37 cpan/ExtUtils-MakeMaker/t/PL_FILES.t | 4 ++--
38 cpan/ExtUtils-MakeMaker/t/basic.t | 4 ++--
39 cpan/ExtUtils-MakeMaker/t/echo.t | 6 +++---
40 cpan/ExtUtils-MakeMaker/t/min_perl_version.t | 4 ++--
41 cpan/ExtUtils-MakeMaker/t/pm_to_blib.t | 4 ++--
42 cpan/ExtUtils-MakeMaker/t/recurs.t | 4 ++--
43 cpan/ExtUtils-MakeMaker/t/several_authors.t | 4 ++--
44 8 files changed, 19 insertions(+), 18 deletions(-)
45
46diff --git a/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t
47index f27b62c..3bbb3a6 100644
48--- a/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t
49+++ b/cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t
50@@ -15,12 +15,13 @@ $CLEANUP &&= 1; # so always 1 or numerically 0
51
52 use MakeMaker::Test::Utils;
53 use MakeMaker::Test::Setup::BFD;
54-use Test::More;
55 use Config;
56 use ExtUtils::MM;
57-plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
58+use Test::More
59+ !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
60 ? (skip_all => "cross-compiling and make not available")
61- : (tests => 3 + $CLEANUP + @INSTDIRS * (15 + $CLEANUP));
62+ : ();
63+plan tests => 3 + $CLEANUP + @INSTDIRS * (15 + $CLEANUP);
64
65 my $Is_VMS = $^O eq 'VMS';
66
67diff --git a/cpan/ExtUtils-MakeMaker/t/PL_FILES.t b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t
68index 0779dbb..85d53a5 100644
69--- a/cpan/ExtUtils-MakeMaker/t/PL_FILES.t
70+++ b/cpan/ExtUtils-MakeMaker/t/PL_FILES.t
71@@ -11,9 +11,9 @@ use File::Temp qw[tempdir];
72 use MakeMaker::Test::Setup::PL_FILES;
73 use MakeMaker::Test::Utils;
74 use Config;
75-use Test::More;
76 use ExtUtils::MM;
77-plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
78+use Test::More
79+ !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
80 ? (skip_all => "cross-compiling and make not available")
81 : (tests => 9);
82
83diff --git a/cpan/ExtUtils-MakeMaker/t/basic.t b/cpan/ExtUtils-MakeMaker/t/basic.t
84index 3dd66ad..eddf2e9 100644
85--- a/cpan/ExtUtils-MakeMaker/t/basic.t
86+++ b/cpan/ExtUtils-MakeMaker/t/basic.t
87@@ -20,9 +20,9 @@ use utf8;
88 use MakeMaker::Test::Utils;
89 use MakeMaker::Test::Setup::BFD;
90 use Config;
91-use Test::More;
92 use ExtUtils::MM;
93-plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
94+use Test::More
95+ !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
96 ? (skip_all => "cross-compiling and make not available")
97 : (tests => 171);
98 use File::Find;
99diff --git a/cpan/ExtUtils-MakeMaker/t/echo.t b/cpan/ExtUtils-MakeMaker/t/echo.t
100index 789b85f..c43bc47 100644
101--- a/cpan/ExtUtils-MakeMaker/t/echo.t
102+++ b/cpan/ExtUtils-MakeMaker/t/echo.t
103@@ -14,11 +14,11 @@ use MakeMaker::Test::Utils;
104 use File::Temp;
105 use Cwd 'abs_path';
106
107-use Test::More;
108 use ExtUtils::MM;
109-plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
110+use Test::More
111+ !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
112 ? (skip_all => "cross-compiling and make not available")
113- : ();
114+ : (tests => 18);
115
116 #--------------------- Setup
117
118diff --git a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
119index c5d78d6..2ef118d 100644
120--- a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
121+++ b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t
122@@ -13,9 +13,9 @@ use TieOut;
123 use MakeMaker::Test::Utils;
124 use MakeMaker::Test::Setup::MPV;
125 use Config;
126-use Test::More;
127 use ExtUtils::MM;
128-plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
129+use Test::More
130+ !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
131 ? (skip_all => "cross-compiling and make not available")
132 : (tests => 36);
133 use File::Path;
134diff --git a/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t
135index f1e348e..ebfa26c 100644
136--- a/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t
137+++ b/cpan/ExtUtils-MakeMaker/t/pm_to_blib.t
138@@ -12,9 +12,9 @@ use ExtUtils::MakeMaker;
139 use MakeMaker::Test::Utils;
140 use MakeMaker::Test::Setup::BFD;
141 use Config;
142-use Test::More;
143 use ExtUtils::MM;
144-plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
145+use Test::More
146+ !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
147 ? (skip_all => "cross-compiling and make not available")
148 : 'no_plan';
149
150diff --git a/cpan/ExtUtils-MakeMaker/t/recurs.t b/cpan/ExtUtils-MakeMaker/t/recurs.t
151index 84c09a2..661e0db 100644
152--- a/cpan/ExtUtils-MakeMaker/t/recurs.t
153+++ b/cpan/ExtUtils-MakeMaker/t/recurs.t
154@@ -14,9 +14,9 @@ use File::Temp qw[tempdir];
155 use MakeMaker::Test::Utils;
156 use MakeMaker::Test::Setup::Recurs;
157 use Config;
158-use Test::More;
159 use ExtUtils::MM;
160-plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
161+use Test::More
162+ !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
163 ? (skip_all => "cross-compiling and make not available")
164 : (tests => 26);
165
166diff --git a/cpan/ExtUtils-MakeMaker/t/several_authors.t b/cpan/ExtUtils-MakeMaker/t/several_authors.t
167index 1a75a3e..869e9f0 100644
168--- a/cpan/ExtUtils-MakeMaker/t/several_authors.t
169+++ b/cpan/ExtUtils-MakeMaker/t/several_authors.t
170@@ -13,9 +13,9 @@ use TieOut;
171 use MakeMaker::Test::Utils;
172 use MakeMaker::Test::Setup::SAS;
173 use Config;
174-use Test::More;
175 use ExtUtils::MM;
176-plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
177+use Test::More
178+ !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
179 ? (skip_all => "cross-compiling and make not available")
180 : (tests => 20);
181 use File::Path;
diff --git a/meta/recipes-devtools/perl/perl/perl-test-customized.patch b/meta/recipes-devtools/perl/perl/perl-test-customized.patch
new file mode 100644
index 0000000000..84b0b88f29
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/perl-test-customized.patch
@@ -0,0 +1,61 @@
1The OE core recipies customize some ExtUtils-MakeMaker modules,
2which causes their MD5 sum to mismatch the provided table and the
3corresponding tests to fail. Also, we patch several test files with
4a backported patch. Update list of hashes to reflect the patched files.
5
6Upstream-Status: Inappropriate [embedded specific]
7
8Signed-off-by: Bill Randle <william.c.randle@intel.com>
9
10Index: perl-5.22.1/t/porting/customized.dat
11===================================================================
12--- perl-5.22.1.orig/t/porting/customized.dat 2015-10-31 13:36:16.000000000 +0000
13+++ perl-5.22.1/t/porting/customized.dat 2016-06-02 12:50:10.381030204 -0700
14@@ -1,8 +1,8 @@
15 CPAN cpan/CPAN/lib/CPAN.pm ce62c43d72f101c011184dbbc59e21c2790826f0
16 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 7f4dfd0fe884bd42412bcf04ca80ef97b39c1d54
17 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm bef099988b15fb0b2a1f5ac48c01af1f7f36d329
18-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 8168e18f0e3ce3ece4bb7e7c72d57ec07c67c402
19-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 7115e97a53559cb3ec061dd6f7f344e522724c4a
20+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm a08ecf80c8f0a234243817713b2a5ab0dcae3c0a
21+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 3d7abd674b15ed323f743594ef0bd09db76b1aee
22 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm f8db8d4245bf0684b8210c811f50d7cfb1a27d78
23 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 757bffb47857521311f8f3bde43ebe165f8d5191
24 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm 82be06851deb84c6419ad003ce9b6d1957f395f3
25@@ -14,7 +14,7 @@
26 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm ab80029ab16d38d4f2e41dc88d2ceb9f3790e477
27 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 453e0abbc4bb38db4c0820ad5c4846f313b66291
28 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm c1b1babda8f43ae7a2caba1cb4f70f92af5a0e34
29-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 6f90d94ad3e7aa0045a3b1a10a1bb18391f89f57
30+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 21bde53290bf1a4da4457290b65bd1b0ca6f1d16
31 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm cab2b3ce08b71a4ce89aa630f236eb08b852439d
32 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 61fced0faf518bf87c265fcb51ed330ba354623f
33 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm ae0ef51a7b6dd0b05aa61c779df7167dda5f5119
34@@ -23,7 +23,7 @@
35 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm 433135eecb85b4b1d90d3027432f329436c78447
36 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm 1fbb5605bfb47feee4083feba8aa85e659628f70
37 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm 5b66d1f485a6034d96fc24ba1665b1bad9e447f1
38-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 8cef99a9bd370ecfd07ddb0efbdcbb4101255e45
39+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 860d520234d7c9036d91f0b143a1dddf2a5e8cb7
40 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm 939572fde3d59ba77c2e677fe2df2bed4bed5898
41 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 09c2049bfd25b735e2a5bcf56a6cff7b4827f9c8
42 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm d65d63f8217a55c36f62e249814988974f593c79
43@@ -31,8 +31,16 @@
44 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm 12df38eacceeed73cab94c423236bfaed0fbbfec
45 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm 22fe9596a0237252f45399a36abc83b7813bc328
46 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm 7fbc42ca2ebc6c677b79ae5fd5647243cf069463
47-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/basic.t 6cdc7701b50e586bc9c4cfb1616de8eb0b1baf34
48-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3
49+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/basic.t d78fdec7a4512dc8d2a7abd62b8104530af8ecf9
50+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/echo.t 9427f4adebbb13b57b4a76fef2972adf63c9bd96
51+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t ef356c196bb5c3c428ae309d7f989bdd6d79b86d
52+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t 3e6d4d6eb2eab42e983ac70eb5737a759af0916f
53+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/INST.t e553fa0d53c894c8d36aafb69edd55b38a9355f8
54+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/min_perl_version.t e930ec9217de5a1785d0247c30b159e6f7f5673f
55+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/PL_FILES.t 7e49ab6c4d467826d22023fa03d77b85f935b58e
56+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t a04c96eecfab17e4094604e0fb998dd93cf93b93
57+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/recurs.t 94cce3bff875a878ed27816b3f5df2ca4225c714
58+ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/several_authors.t f811d993c0835c66dc501ed55083acb29bf33bf7
59 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 9bae51c9b944cd5c0bbabe9d397e573976a2be8e
60 Win32API::File cpan/Win32API-File/buffers.h 02d230ac9ac7091365128161a0ed671898baefae
61 Win32API::File cpan/Win32API-File/cFile.h fca7e383e76979c3ac3adf12d11d1bcd2618e489
diff --git a/meta/recipes-devtools/perl/perl_5.22.1.bb b/meta/recipes-devtools/perl/perl_5.22.1.bb
index f955e6ff4b..3bd0a6debc 100644
--- a/meta/recipes-devtools/perl/perl_5.22.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.1.bb
@@ -63,6 +63,8 @@ SRC_URI += " \
63 file://ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch \ 63 file://ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch \
64 file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \ 64 file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
65 file://perl-errno-generation-gcc5.patch \ 65 file://perl-errno-generation-gcc5.patch \
66 file://perl-fix-conflict-between-skip_all-and-END.patch \
67 file://perl-test-customized.patch \
66" 68"
67 69
68# Fix test case issues 70# Fix test case issues
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-09 20:01:10 +0000