From 16542d982d86d42d3189d47a8180f0f71646a9ca Mon Sep 17 00:00:00 2001
From: Venkata ramana gollamudi <ramana.gollamudi@huawei.com>
Date: Tue, 17 Apr 2012 09:04:15 +0000
Subject: perl: fix re-execution of compile task
After building perl package, re-execution of compile task recursively
substitutes the path, making it an invalid path.
Fixed to prevent recursive substitution.
Similar case as [Yocto #2194]
Signed-off-by: Venkata Ramana Gollamudi <ramana.gollamudi@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/perl/perl_5.14.2.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'meta')
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index ecb226279..809fc72d3 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -174,8 +174,9 @@ do_configure() {
}
do_compile() {
- sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL
- sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' cpan/Compress-Raw-Zlib/config.in
+ # Fix to avoid recursive substitution of path
+ sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" ext/Errno/Errno_pm.PL
+ sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" cpan/Compress-Raw-Zlib/config.in
sed -i -e 's|/usr/lib|""|g' cpan/Compress-Raw-Zlib/config.in
sed -i -e 's|SYSROOTLIB|${STAGING_LIBDIR}|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
--
cgit v1.2.3