diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-04 15:54:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-06 08:41:26 +0100 |
commit | 9f951a2d4985d2d05ceb135e0786e1e1ecd73fc0 (patch) | |
tree | 1a75d350fcc3d51627fd6ecfb44bec78aef5b049 /meta/recipes-devtools/perl | |
parent | 5a0679cb7589cdc40bc60b28a4a7756c43e72cf1 (diff) | |
download | poky-9f951a2d4985d2d05ceb135e0786e1e1ecd73fc0.tar.gz |
Revert "perl: fix startperl configuration option for perl-native"
This reverts commit f2d1523b19cb066a4a06609f036822fe4a8b43f0.
We've reports of a number of failures from this, it causes pod2man to
reference full paths to perl rather than nativeperl from the environment.
I've also seen this issue locally now. Revert until we can find a solution
which works for everyone.
(From OE-Core rev: 231c99728da9d81c9430a2aa62239ce28734ef4a)
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, 2 insertions, 3 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.32.1.bb b/meta/recipes-devtools/perl/perl_5.32.1.bb index 73d66f6656..b28040c7fb 100644 --- a/meta/recipes-devtools/perl/perl_5.32.1.bb +++ b/meta/recipes-devtools/perl/perl_5.32.1.bb | |||
@@ -95,7 +95,6 @@ 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 \ | ||
99 | -Duseshrplib \ | 98 | -Duseshrplib \ |
100 | -Dsoname=libperl.so.5 \ | 99 | -Dsoname=libperl.so.5 \ |
101 | -Dvendorprefix=${prefix} \ | 100 | -Dvendorprefix=${prefix} \ |
@@ -172,8 +171,8 @@ do_install_append_class-native () { | |||
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}' | 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}' |
173 | 172 | ||
174 | # Use /usr/bin/env nativeperl for the perl script. | 173 | # Use /usr/bin/env nativeperl for the perl script. |
175 | for f in `grep -Il '#! *${bindir}/perl-native.*/perl' ${D}/${bindir}/*`; do | 174 | for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do |
176 | sed -i -e 's|${bindir}/perl-native.*/perl|/usr/bin/env nativeperl|' $f | 175 | sed -i -e 's|${bindir}/perl|/usr/bin/env nativeperl|' $f |
177 | done | 176 | done |
178 | } | 177 | } |
179 | 178 | ||