From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 4 May 2021 14:54:32 +0000 (+0100)
Subject: Revert "perl: fix startperl configuration option for perl-native"
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~7988
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=231c99728da9d81c9430a2aa62239ce28734ef4a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/perl/perl_5.32.1.bb b/meta/recipes-devtools/perl/perl_5.32.1.bb
index 73d66f66568..b28040c7fb0 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() {
 do_configure_class-native() {
     ./configure --prefix=${prefix} \
     -Dbin=${bindir}/perl-native \
-    -Dperlpath=${bindir}/perl-native/perl \
     -Duseshrplib \
     -Dsoname=libperl.so.5 \
     -Dvendorprefix=${prefix} \
@@ -172,8 +171,8 @@ do_install_append_class-native () {
     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}'
 
     # Use /usr/bin/env nativeperl for the perl script.
-    for f in `grep -Il '#! *${bindir}/perl-native.*/perl' ${D}/${bindir}/*`; do
-            sed -i -e 's|${bindir}/perl-native.*/perl|/usr/bin/env nativeperl|' $f
+    for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do
+            sed -i -e 's|${bindir}/perl|/usr/bin/env nativeperl|' $f
     done
 }