diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-08-27 22:40:06 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-28 15:11:10 +0100 |
commit | 0d2e2ac137465885a1d55103010ccfdec579f1ce (patch) | |
tree | b100c32be79f2f1bb32cfe4f1383d1f24c81525e /meta/classes/cpan.bbclass | |
parent | 83dec26849a120d0f1de64e63025354fa7108491 (diff) | |
download | openembedded-core-0d2e2ac137465885a1d55103010ccfdec579f1ce.tar.gz openembedded-core-0d2e2ac137465885a1d55103010ccfdec579f1ce.tar.bz2 openembedded-core-0d2e2ac137465885a1d55103010ccfdec579f1ce.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.
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.bbclass | 4 |
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 } |