diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-19 14:38:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-19 21:27:11 +0000 |
commit | fe97845a45434902c5a994e253a127a462d7d3b4 (patch) | |
tree | b35b5d51fc51e5ae68c8547a4cbc128a79ee0b9a | |
parent | ff7c386455848e497ef40f9fee2be87d5171e203 (diff) | |
download | openembedded-core-contrib-fe97845a45434902c5a994e253a127a462d7d3b4.tar.gz |
perl: Fix makefile race causing configuration differences
Add a missing makefile dependency which can cause differences in
configuration (submitted upstream).
[YOCTO #13800]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/perl/files/racefix.patch | 24 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.30.1.bb | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/files/racefix.patch b/meta/recipes-devtools/perl/files/racefix.patch new file mode 100644 index 0000000000..bac42d26ae --- /dev/null +++ b/meta/recipes-devtools/perl/files/racefix.patch @@ -0,0 +1,24 @@ +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.1.bb index b37f175f97..4869012b1a 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -22,6 +22,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0002-Constant-Fix-up-shebang.patch \ file://0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch \ file://determinism.patch \ + file://racefix.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ |