diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-01 16:20:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-02 11:06:00 +0000 |
commit | d715262149e3cd564dc3e2c2e74b1d0c115047f8 (patch) | |
tree | adfc07262f031acc304306e6f49c7a3465101514 /meta | |
parent | e63e5b2e189df3a3aeddcb42696793a29539c8a8 (diff) | |
download | poky-d715262149e3cd564dc3e2c2e74b1d0c115047f8.tar.gz |
perl: update perl-cross to 1.2.2
This allows us to drop the build race fixes.
(From OE-Core rev: c869560c25223dd336ce84847ddbdbe44e4c391c)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
6 files changed, 5 insertions, 169 deletions
diff --git a/meta/recipes-devtools/perl-sanity/files/0001-Also-build-dynaloader-separately-as-race-failures-ha.patch b/meta/recipes-devtools/perl-sanity/files/0001-Also-build-dynaloader-separately-as-race-failures-ha.patch deleted file mode 100644 index 15678b83ba..0000000000 --- a/meta/recipes-devtools/perl-sanity/files/0001-Also-build-dynaloader-separately-as-race-failures-ha.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 9c68cdd1a89f9b944edc804d7c5d000c45de7b85 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 14 Jan 2019 11:45:20 +0100 | ||
4 | Subject: [PATCH] Also build dynaloader separately as race failures have been | ||
5 | observed in Yocto. | ||
6 | |||
7 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/issues/72] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | Makefile | 5 ++++- | ||
11 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/Makefile b/Makefile | ||
14 | index 7846406..cd8d75f 100644 | ||
15 | --- a/Makefile | ||
16 | +++ b/Makefile | ||
17 | @@ -74,10 +74,13 @@ $(CROSSPATCHED): %.applied: %.patch | ||
18 | # Force full patching before any building starts. Als, force early building | ||
19 | # of miniperl -- not really necessary, but makes the build process more logical. | ||
20 | # No reason to try CC if HOSTCC fails. | ||
21 | +# | ||
22 | +# Dynaloader is also built separately as race failures have been observed. | ||
23 | all: | ||
24 | $(MAKE) crosspatch | ||
25 | $(MAKE) miniperl$X | ||
26 | - $(MAKE) dynaloader perl$x nonxs_ext utilities extensions pods | ||
27 | + $(MAKE) dynaloader | ||
28 | + $(MAKE) perl$x nonxs_ext utilities extensions pods | ||
29 | |||
30 | config.h: config.sh config_h.SH | ||
31 | CONFIG_H=$@ CONFIG_SH=$< ./config_h.SH | ||
diff --git a/meta/recipes-devtools/perl-sanity/files/0001-Make-sure-install.perl-runs-before-install.man.patch b/meta/recipes-devtools/perl-sanity/files/0001-Make-sure-install.perl-runs-before-install.man.patch deleted file mode 100644 index 26590f5908..0000000000 --- a/meta/recipes-devtools/perl-sanity/files/0001-Make-sure-install.perl-runs-before-install.man.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 965adc80636e24e9608ca983c18c95cae08de021 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 21 Jan 2019 12:09:13 +0100 | ||
4 | Subject: [PATCH] Make sure install.perl runs before install.man | ||
5 | |||
6 | Otherwise, install.man may attempt to write to non-existing directory: | ||
7 | | Can't open file /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/perl/5.28.1-r0/image/usr/libx32/perl5/5.28.1/x86_64-linux/.packlist: No such file or directory at installman line 183. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/issues/72] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | Makefile | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile b/Makefile | ||
16 | index cd8d75f..82bdc1d 100644 | ||
17 | --- a/Makefile | ||
18 | +++ b/Makefile | ||
19 | @@ -410,7 +410,7 @@ install.perl: installperl | miniperl$X | ||
20 | ./miniperl_top installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
21 | -@test ! -s extras.lst || $(MAKE) extras.install | ||
22 | |||
23 | -install.man: installman pod/perltoc.pod | miniperl$X | ||
24 | +install.man: install.perl installman pod/perltoc.pod | miniperl$X | ||
25 | ./miniperl_top installman --destdir=$(DESTDIR) $(INSTALLFLAGS) | ||
26 | |||
27 | ifneq ($(perlname),perl) | ||
diff --git a/meta/recipes-devtools/perl-sanity/files/0001-Makefile-Make-install.perl-depend-on-install.sym.patch b/meta/recipes-devtools/perl-sanity/files/0001-Makefile-Make-install.perl-depend-on-install.sym.patch deleted file mode 100644 index 1267339978..0000000000 --- a/meta/recipes-devtools/perl-sanity/files/0001-Makefile-Make-install.perl-depend-on-install.sym.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From a0a2fcac3735ca90017976d2b87f550d051a969b Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Tue, 22 Jan 2019 19:21:27 -0800 | ||
4 | Subject: [PATCH] Makefile: Make install.perl depend on install.sym | ||
5 | |||
6 | Fix a race issue when install, there might be no | ||
7 | $(installbin)/$(perlname)$(version) when install.sym runs after install.perl | ||
8 | since install.sym removes it. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/73] | ||
11 | |||
12 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
13 | --- | ||
14 | Makefile | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/Makefile b/Makefile | ||
18 | index cd8d75f..1aa8ef2 100644 | ||
19 | --- a/Makefile | ||
20 | +++ b/Makefile | ||
21 | @@ -406,7 +406,7 @@ META.yml: Porting/makemeta Porting/Maintainers.pl Porting/Maintainers.pm miniper | ||
22 | |||
23 | install: install.perl install.sym install.man | ||
24 | |||
25 | -install.perl: installperl | miniperl$X | ||
26 | +install.perl: installperl install.sym | miniperl$X | ||
27 | ./miniperl_top installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) | ||
28 | -@test ! -s extras.lst || $(MAKE) extras.install | ||
29 | |||
30 | -- | ||
31 | 2.10.2 | ||
32 | |||
diff --git a/meta/recipes-devtools/perl-sanity/files/fix-race-failures-2.patch b/meta/recipes-devtools/perl-sanity/files/fix-race-failures-2.patch deleted file mode 100644 index bc42342e14..0000000000 --- a/meta/recipes-devtools/perl-sanity/files/fix-race-failures-2.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From e1e159a189247af1557fe400ca861714e5ed5af4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Suykov <alex.suykov@gmail.com> | ||
3 | Date: Thu, 3 Jan 2019 22:03:20 +0200 | ||
4 | Subject: [PATCH] force crosspatch before any CC/HOSTCC rules | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/issues/72] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | Makefile | 10 +++++++--- | ||
11 | 1 file changed, 7 insertions(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/Makefile b/Makefile | ||
14 | index 01644cd..62bfc8c 100644 | ||
15 | --- a/Makefile | ||
16 | +++ b/Makefile | ||
17 | @@ -71,9 +71,13 @@ $(CROSSPATCHED): %.applied: %.patch | ||
18 | # (mostly Makefile.PLs, but others can be annoying too) | ||
19 | .SECONDARY: | ||
20 | |||
21 | -# Force early building of miniperl -- not really necessary, but makes | ||
22 | -# the build process more logical. No reason to try CC if HOSTCC fails. | ||
23 | -all: crosspatch miniperl$X dynaloader perl$x nonxs_ext utilities extensions pods | ||
24 | +# Force full patching before any building starts. Als, force early building | ||
25 | +# of miniperl -- not really necessary, but makes the build process more logical. | ||
26 | +# No reason to try CC if HOSTCC fails. | ||
27 | +all: | ||
28 | + $(MAKE) crosspatch | ||
29 | + $(MAKE) miniperl$X | ||
30 | + $(MAKE) dynaloader perl$x nonxs_ext utilities extensions pods | ||
31 | |||
32 | config.h: config.sh config_h.SH | ||
33 | CONFIG_H=$@ CONFIG_SH=$< ./config_h.SH | ||
34 | |||
diff --git a/meta/recipes-devtools/perl-sanity/files/fix-race-failures.patch b/meta/recipes-devtools/perl-sanity/files/fix-race-failures.patch deleted file mode 100644 index f3bffd0abd..0000000000 --- a/meta/recipes-devtools/perl-sanity/files/fix-race-failures.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 3e2c1ddd06be97ba75104b1be4b6fdbd08e16bbe Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Suykov <alex.suykov@gmail.com> | ||
3 | Date: Wed, 2 Jan 2019 20:37:47 +0200 | ||
4 | Subject: [PATCH] fix Yocto intermittent failures with modules | ||
5 | |||
6 | Having -Ilib/ above -Idist/... in miniperl_top means miniperl may | ||
7 | attempt to switch from dist/ to lib/ while the modules are being | ||
8 | built, possibly picking incompletely-written files there. | ||
9 | |||
10 | Any module available via -Idist/* should only be loaded from dist/ | ||
11 | and never from lib/ even if it gets installed into lib/ at some point. | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/arsv/perl-cross/issues/72] | ||
14 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
15 | --- | ||
16 | miniperl_top | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/miniperl_top b/miniperl_top | ||
20 | index 96ab1a2..a0426b9 100755 | ||
21 | --- a/miniperl_top | ||
22 | +++ b/miniperl_top | ||
23 | @@ -25,7 +25,6 @@ top=$(cd $top; pwd) | ||
24 | exec $top/miniperl\ | ||
25 | -I$top/cnf/stub\ | ||
26 | -I$top/cnf/cpan\ | ||
27 | - -I$top/lib\ | ||
28 | -I$top/cpan/AutoLoader/lib\ | ||
29 | -I$top/dist/Exporter/lib\ | ||
30 | -I$top/dist/Cwd\ | ||
31 | @@ -50,4 +49,5 @@ exec $top/miniperl\ | ||
32 | -I$top/cpan/parent/lib\ | ||
33 | -I$top/cpan/version/lib\ | ||
34 | -I$top/dist/Pod-Simple/lib\ | ||
35 | + -I$top/lib\ | ||
36 | "$@" | ||
diff --git a/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb b/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb index a2ec264100..dc6689738d 100644 --- a/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb +++ b/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ | |||
8 | 8 | ||
9 | 9 | ||
10 | SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ | 10 | SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ |
11 | https://github.com/arsv/perl-cross/releases/download/1.2.1/perl-cross-1.2.1.tar.gz;name=perl-cross \ | 11 | https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz;name=perl-cross \ |
12 | file://perl-rdepends.txt \ | 12 | file://perl-rdepends.txt \ |
13 | file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ | 13 | file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ |
14 | file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ | 14 | file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ |
@@ -19,17 +19,14 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ | |||
19 | file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ | 19 | file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ |
20 | file://perl-dynloader.patch \ | 20 | file://perl-dynloader.patch \ |
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://fix-race-failures.patch \ | ||
23 | file://fix-race-failures-2.patch \ | ||
24 | file://0001-Also-build-dynaloader-separately-as-race-failures-ha.patch \ | ||
25 | file://0001-Make-sure-install.perl-runs-before-install.man.patch \ | ||
26 | file://0001-Makefile-Make-install.perl-depend-on-install.sym.patch \ | ||
27 | " | 22 | " |
28 | 23 | ||
29 | SRC_URI[perl.md5sum] = "838198c43d4f39d7af797e2f59c2bee5" | 24 | SRC_URI[perl.md5sum] = "838198c43d4f39d7af797e2f59c2bee5" |
30 | SRC_URI[perl.sha256sum] = "3ebf85fe65df2ee165b22596540b7d5d42f84d4b72d84834f74e2e0b8956c347" | 25 | SRC_URI[perl.sha256sum] = "3ebf85fe65df2ee165b22596540b7d5d42f84d4b72d84834f74e2e0b8956c347" |
31 | SRC_URI[perl-cross.md5sum] = "c5cdc8b7ebc449ee57fe18fc1ac60c80" | 26 | SRC_URI[perl-cross.md5sum] = "9a6c05497bdde9a3106e3be9246f4da1" |
32 | SRC_URI[perl-cross.sha256sum] = "8b706bc688ddf71b62d649bde72f648669f18b37fe0c54ec6201142ca3943498" | 27 | SRC_URI[perl-cross.sha256sum] = "e6987838f27d8cd3368ea68fc56a68cc52371505950927b8b7c5cb76e3a94caa" |
28 | |||
29 | PR = "r1" | ||
33 | 30 | ||
34 | S = "${WORKDIR}/perl-${PV}" | 31 | S = "${WORKDIR}/perl-${PV}" |
35 | 32 | ||
@@ -127,7 +124,6 @@ do_install_append_class-native () { | |||
127 | # path location) works and that in the nativesdk case, the SDK can be | 124 | # path location) works and that in the nativesdk case, the SDK can be |
128 | # installed to a different location from the one it was built for. | 125 | # installed to a different location from the one it was built for. |
129 | create_wrapper ${D}${bindir}/perl-native/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl5/site_perl/${PV}:${STAGING_LIBDIR}/perl5/vendor_perl/${PV}:${STAGING_LIBDIR}/perl5/${PV}' | 126 | create_wrapper ${D}${bindir}/perl-native/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl5/site_perl/${PV}:${STAGING_LIBDIR}/perl5/vendor_perl/${PV}:${STAGING_LIBDIR}/perl5/${PV}' |
130 | create_wrapper ${D}${bindir}/perl-native/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl5/site_perl/${PV}:${STAGING_LIBDIR}/perl5/vendor_perl/${PV}:${STAGING_LIBDIR}/perl5/${PV}' | ||
131 | 127 | ||
132 | # Use /usr/bin/env nativeperl for the perl script. | 128 | # Use /usr/bin/env nativeperl for the perl script. |
133 | for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do | 129 | for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do |