diff options
-rw-r--r-- | meta/recipes-devtools/perl/files/perl-cross-makefile.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.32.1.bb (renamed from meta/recipes-devtools/perl/perl_5.32.0.bb) | 7 |
2 files changed, 3 insertions, 33 deletions
diff --git a/meta/recipes-devtools/perl/files/perl-cross-makefile.patch b/meta/recipes-devtools/perl/files/perl-cross-makefile.patch deleted file mode 100644 index 5d3f998200..0000000000 --- a/meta/recipes-devtools/perl/files/perl-cross-makefile.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
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.1.bb index 7d88c65322..1fafc0a8c9 100644 --- a/meta/recipes-devtools/perl/perl_5.32.0.bb +++ b/meta/recipes-devtools/perl/perl_5.32.1.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ | |||
9 | 9 | ||
10 | 10 | ||
11 | SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ | 11 | SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ |
12 | https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz;name=perl-cross \ | 12 | https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \ |
13 | file://perl-rdepends.txt \ | 13 | file://perl-rdepends.txt \ |
14 | file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ | 14 | file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ |
15 | file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ | 15 | file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ |
@@ -21,7 +21,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ | |||
21 | file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ | 21 | file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ |
22 | file://0002-Constant-Fix-up-shebang.patch \ | 22 | file://0002-Constant-Fix-up-shebang.patch \ |
23 | file://determinism.patch \ | 23 | file://determinism.patch \ |
24 | file://perl-cross-makefile.patch \ | ||
25 | " | 24 | " |
26 | SRC_URI_append_class-native = " \ | 25 | SRC_URI_append_class-native = " \ |
27 | file://perl-configpm-switch.patch \ | 26 | file://perl-configpm-switch.patch \ |
@@ -30,8 +29,8 @@ SRC_URI_append_class-target = " \ | |||
30 | file://encodefix.patch \ | 29 | file://encodefix.patch \ |
31 | " | 30 | " |
32 | 31 | ||
33 | SRC_URI[perl.sha256sum] = "efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4" | 32 | SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c" |
34 | SRC_URI[perl-cross.sha256sum] = "755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba" | 33 | SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25" |
35 | 34 | ||
36 | S = "${WORKDIR}/perl-${PV}" | 35 | S = "${WORKDIR}/perl-${PV}" |
37 | 36 | ||