[oe-commits] Xin Ouyang : cpan.bbclass: Fix config error while patches to Makefile.PL

git at git.openembedded.org git at git.openembedded.org
Tue Jun 5 21:57:55 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: 7c99105d70a16aa9e42429224abed28743e627b2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7c99105d70a16aa9e42429224abed28743e627b2

Author: Xin Ouyang <Xin.Ouyang at windriver.com>
Date:   Thu May 31 15:46:12 2012 +0800

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.

Signed-off-by: Xin Ouyang <Xin.Ouyang at windriver.com>

---

 meta/classes/cpan.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 587e688..2e9432c 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -23,6 +23,7 @@ cpan_do_configure () {
 		# Use find since there can be a Makefile generated for each Makefile.PL
 		for f in `find -name Makefile.PL`; do
 			f2=`echo $f | sed -e 's/.PL//'`
+			test -f $f2 || continue
 			sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \
 				-e 's/perl.real/perl/' \
 				$f2





More information about the Openembedded-commits mailing list