summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin Ouyang <Xin.Ouyang@windriver.com>2012-05-31 15:46:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-05 22:56:30 +0100
commitd0fac332cf24577aecf76d14614a771a2116887a (patch)
tree78fb876ae97d4ec7e07bfb41883860f952d46f8f
parentb1f7bb912ff24e6885552ba656bd1bf9e23fa82c (diff)
downloadpoky-d0fac332cf24577aecf76d14614a771a2116887a.tar.gz
cpan.bbclass: Fix config error while patches to Makefile.PL
If there is a patch to Makefile.PL, a Makefile.PL but no Makefile will be placed in ${B}/.pc/xxx.patch/ after do_patch. And no Makefile will be generated for *this* Makefile.PL. While do_configure, the original code tries to sed Makefiles matching with each Makefile.PL in {B}, so this would fail. (From OE-Core rev: 7c99105d70a16aa9e42429224abed28743e627b2) Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cpan.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 587e688bc2..2e9432c0bb 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -23,6 +23,7 @@ cpan_do_configure () {
23 # Use find since there can be a Makefile generated for each Makefile.PL 23 # Use find since there can be a Makefile generated for each Makefile.PL
24 for f in `find -name Makefile.PL`; do 24 for f in `find -name Makefile.PL`; do
25 f2=`echo $f | sed -e 's/.PL//'` 25 f2=`echo $f | sed -e 's/.PL//'`
26 test -f $f2 || continue
26 sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \ 27 sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \
27 -e 's/perl.real/perl/' \ 28 -e 's/perl.real/perl/' \
28 $f2 29 $f2