Drop perl-cross-makefile.patch as it is merged upstream. Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> --- .../perl/files/perl-cross-makefile.patch | 29 ------------------- .../perl/{perl_5.32.0.bb => perl_5.32.1.bb} | 7 ++--- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-devtools/perl/files/perl-cross-makefile.patch rename meta/recipes-devtools/perl/{perl_5.32.0.bb => perl_5.32.1.bb} (98%)
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 @@ -Makefile: Avoid continual rebuilds of miniperl and associated races - -In the Yocto Project, when we run "make install" we notice miniperl -rebuilding multiple times. Usually this is harmless however sometimes -race issues occur such as miniperl not being executable. - -The issue is that crosspatch is a phony target so it always rebuilds. -Adding this as a dependency of miniperl means miniperl always rebuilds -too. - -Avoid this by injecting a direct dependency avoiding the phony target. -miniperl is then only rebuilt when its input changes as desired. - -Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/95] - -Index: perl-5.32.0/Makefile -=================================================================== ---- perl-5.32.0.orig/Makefile -+++ perl-5.32.0/Makefile -@@ -56,7 +56,7 @@ crosspatch: $(CROSSPATCHED) - - # A minor fix for buildroot, force crosspatching when running "make perl modules" - # instead of "make all". --miniperlmain$O: crosspatch -+miniperlmain$O: $(CROSSPATCHED) - - # Original versions are not saved anymore; patch generally takes care of this, - # 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 similarity index 98% rename from meta/recipes-devtools/perl/perl_5.32.0.bb rename to 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 \ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ - https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz;name=perl-cross \ + https://github.com/arsv/perl-cross/releases/download/1.3.5/perl-cross-1.3.5.tar.gz;name=perl-cross \ file://perl-rdepends.txt \ file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ 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 \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ - file://perl-cross-makefile.patch \ " SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ @@ -30,8 +29,8 @@ SRC_URI_append_class-target = " \ file://encodefix.patch \ " -SRC_URI[perl.sha256sum] = "efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4" -SRC_URI[perl-cross.sha256sum] = "755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba" +SRC_URI[perl.sha256sum] = "03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c" +SRC_URI[perl-cross.sha256sum] = "91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25" S = "${WORKDIR}/perl-${PV}" -- 2.29.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148748): https://lists.openembedded.org/g/openembedded-core/message/148748 Mute This Topic: https://lists.openembedded.org/mt/80974304/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-