| Submitter | Venkata ramana gollamudi |
|---|---|
| Date | April 17, 2012, 9:04 a.m. |
| Message ID | <36ED13F3654AE54CA763E6821D93A5711043E81A@szxeml534-mbx.china.huawei.com> |
| Download | mbox | patch |
| Permalink | /patch/26039/ |
| State | Accepted |
| Commit | 16542d982d86d42d3189d47a8180f0f71646a9ca |
| Headers | show |
Comments
On 04/17/2012 02:04 AM, Venkata ramana gollamudi wrote: > 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> > --- > meta/recipes-devtools/perl/perl_5.14.2.bb | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb > index ecb2262..809fc72 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 > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index ecb2262..809fc72 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
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> --- meta/recipes-devtools/perl/perl_5.14.2.bb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)