]> code.ossystems Code Review - openembedded-core.git/commitdiff
perl: fix re-execution of compile task
authorVenkata ramana gollamudi <ramana.gollamudi@huawei.com>
Tue, 17 Apr 2012 09:04:15 +0000 (09:04 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 17 Apr 2012 11:24:32 +0000 (12:24 +0100)
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

index ecb226279657d8d211df441288cfcf5216706775..809fc72d3319bb5a3acb29491ba192515c5815d6 100644 (file)
@@ -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