diff options
author | Paulo Cesar Zaneti <paulo.zaneti@gmail.com> | 2021-04-19 10:55:55 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-24 17:53:04 +0100 |
commit | de0c3226ab3bf96c3957f6cee877bf08dc687806 (patch) | |
tree | 8d1ae242d885b756dd61155dd94a284ee72f10f3 /meta/recipes-devtools/perl | |
parent | 4aff77c8518fc32727291aa01a658036b3b62118 (diff) | |
download | poky-de0c3226ab3bf96c3957f6cee877bf08dc687806.tar.gz |
perl: fix startperl configuration option for perl-native
Unlike vanilla Perl "Configure" script, perl-cross "configure" does not
derive "startperl" from "bin". It instead derives from "perlpath".
This patch aims to fix "startperl" configuration option for perl-native by
correctly setting "perlpath" on perl-cross "configure" script.
It also changes do_install_append_class-native task to comply with
cpan_do_install task.
(From OE-Core rev: f2d1523b19cb066a4a06609f036822fe4a8b43f0)
Signed-off-by: Paulo Cesar Zaneti <paulo.zaneti@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.32.1.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.32.1.bb b/meta/recipes-devtools/perl/perl_5.32.1.bb index b28040c7fb..73d66f6656 100644 --- a/meta/recipes-devtools/perl/perl_5.32.1.bb +++ b/meta/recipes-devtools/perl/perl_5.32.1.bb | |||
@@ -95,6 +95,7 @@ do_configure_class-nativesdk() { | |||
95 | do_configure_class-native() { | 95 | do_configure_class-native() { |
96 | ./configure --prefix=${prefix} \ | 96 | ./configure --prefix=${prefix} \ |
97 | -Dbin=${bindir}/perl-native \ | 97 | -Dbin=${bindir}/perl-native \ |
98 | -Dperlpath=${bindir}/perl-native/perl \ | ||
98 | -Duseshrplib \ | 99 | -Duseshrplib \ |
99 | -Dsoname=libperl.so.5 \ | 100 | -Dsoname=libperl.so.5 \ |
100 | -Dvendorprefix=${prefix} \ | 101 | -Dvendorprefix=${prefix} \ |
@@ -171,8 +172,8 @@ do_install_append_class-native () { | |||
171 | 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}' | 172 | 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}' |
172 | 173 | ||
173 | # Use /usr/bin/env nativeperl for the perl script. | 174 | # Use /usr/bin/env nativeperl for the perl script. |
174 | for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do | 175 | for f in `grep -Il '#! *${bindir}/perl-native.*/perl' ${D}/${bindir}/*`; do |
175 | sed -i -e 's|${bindir}/perl|/usr/bin/env nativeperl|' $f | 176 | sed -i -e 's|${bindir}/perl-native.*/perl|/usr/bin/env nativeperl|' $f |
176 | done | 177 | done |
177 | } | 178 | } |
178 | 179 | ||