Skip to contentSkip to conversation

perl: Improve sysroot regexp

PATCH New Richard Purdie 1 participant 1 message Sep 30, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perl: Improve sysroot regexp

When rebuilding libxml-parser-perl with a change to libdir, you see strange build failures due to MakerMake looking in strange library paths. The error is obtuse and hard to track down. I'm therefore proposing we change the regexp once and for all to resolve the issue. Currently it only does a replacement once, this change ensures it always gets set the correct value upon rebuilds.

meta/recipes-devtools/perl/perl_5.20.0.bb +1 -1
index e984c90..e594c5c 100644
@@ -189,7 +189,7 @@ do_compile() {
         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
+        sed -i -e 's|(@libpath, ".*"|(@libpath, "${STAGING_LIBDIR}"|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
 
         cd Cross
         oe_runmake perl LD="${CCLD}"