summaryrefslogtreecommitdiffstats
path: root/meta/classes/cpan.bbclass
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-08-27 22:40:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-28 15:12:43 +0100
commit9c0d4f5ba26db5840da6a6ca157f8920031b3cee (patch)
tree1481a6cb53404f2de24ac5910fa009b6ce1b457f /meta/classes/cpan.bbclass
parent89a2b841c11717b9da786405ceb1b593f199860f (diff)
downloadpoky-9c0d4f5ba26db5840da6a6ca157f8920031b3cee.tar.gz
poky-9c0d4f5ba26db5840da6a6ca157f8920031b3cee.tar.bz2
poky-9c0d4f5ba26db5840da6a6ca157f8920031b3cee.zip
cpan.bbclass: matches more lines
Fixed: - There might be a space between "#!" and "/pat/to/usr/bin/perl", e.g.: "#! /usr/bin/perl", now also matches it. - There might be the lines like the following in the body: eval 'exec /path/to/usr/bin/perl-native/perl -S $0 ${1+"$@"}' Now we only check "#! */path/to/usr/bin/perl" to make sure it is a perl script, but match and fix the lines in both header and body. (From OE-Core rev: 0d2e2ac137465885a1d55103010ccfdec579f1ce) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cpan.bbclass')
-rw-r--r--meta/classes/cpan.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 7088039fa0..e2bbd2f63a 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -47,8 +47,8 @@ cpan_do_compile () {
cpan_do_install () {
oe_runmake DESTDIR="${D}" install_vendor
- for PERLSCRIPT in `grep -rIEl '#!${bindir}/perl-native.*/perl' ${D}`; do
- sed -i -e 's|^#!${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' $PERLSCRIPT
+ for PERLSCRIPT in `grep -rIEl '#! *${bindir}/perl-native.*/perl' ${D}`; do
+ sed -i -e 's|${bindir}/perl-native.*/perl|/usr/bin/env nativeperl|' $PERLSCRIPT
done
}