From 03813f4870e2d6e6f4b97d643352eb42887ce99a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 Sep 2014 21:08:17 +0100 Subject: 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. (From OE-Core rev: 2c1c70eef4df66a0208f60ee51bd36d8f794144e) Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl_5.20.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-devtools/perl') diff --git a/meta/recipes-devtools/perl/perl_5.20.0.bb b/meta/recipes-devtools/perl/perl_5.20.0.bb index e984c906de..e594c5c7cf 100644 --- a/meta/recipes-devtools/perl/perl_5.20.0.bb +++ b/meta/recipes-devtools/perl/perl_5.20.0.bb @@ -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}" -- cgit v1.2.3-54-g00ecf