diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/perl/files/perl-cross-makefile.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.32.0.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/files/perl-cross-makefile.patch b/meta/recipes-devtools/perl/files/perl-cross-makefile.patch new file mode 100644 index 0000000000..5d3f998200 --- /dev/null +++ b/meta/recipes-devtools/perl/files/perl-cross-makefile.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Makefile: Avoid continual rebuilds of miniperl and associated races | ||
2 | |||
3 | In the Yocto Project, when we run "make install" we notice miniperl | ||
4 | rebuilding multiple times. Usually this is harmless however sometimes | ||
5 | race issues occur such as miniperl not being executable. | ||
6 | |||
7 | The issue is that crosspatch is a phony target so it always rebuilds. | ||
8 | Adding this as a dependency of miniperl means miniperl always rebuilds | ||
9 | too. | ||
10 | |||
11 | Avoid this by injecting a direct dependency avoiding the phony target. | ||
12 | miniperl is then only rebuilt when its input changes as desired. | ||
13 | |||
14 | Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org | ||
15 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/95] | ||
16 | |||
17 | Index: perl-5.32.0/Makefile | ||
18 | =================================================================== | ||
19 | --- perl-5.32.0.orig/Makefile | ||
20 | +++ perl-5.32.0/Makefile | ||
21 | @@ -56,7 +56,7 @@ crosspatch: $(CROSSPATCHED) | ||
22 | |||
23 | # A minor fix for buildroot, force crosspatching when running "make perl modules" | ||
24 | # instead of "make all". | ||
25 | -miniperlmain$O: crosspatch | ||
26 | +miniperlmain$O: $(CROSSPATCHED) | ||
27 | |||
28 | # Original versions are not saved anymore; patch generally takes care of this, | ||
29 | # and if that fails, reaching for the source tarball is the safest option. | ||
diff --git a/meta/recipes-devtools/perl/perl_5.32.0.bb b/meta/recipes-devtools/perl/perl_5.32.0.bb index 1adfd90e73..c10ce12303 100644 --- a/meta/recipes-devtools/perl/perl_5.32.0.bb +++ b/meta/recipes-devtools/perl/perl_5.32.0.bb | |||
@@ -20,6 +20,7 @@ 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://0002-Constant-Fix-up-shebang.patch \ | 21 | file://0002-Constant-Fix-up-shebang.patch \ |
22 | file://determinism.patch \ | 22 | file://determinism.patch \ |
23 | file://perl-cross-makefile.patch \ | ||
23 | " | 24 | " |
24 | SRC_URI_append_class-native = " \ | 25 | SRC_URI_append_class-native = " \ |
25 | file://perl-configpm-switch.patch \ | 26 | file://perl-configpm-switch.patch \ |