diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-30 21:08:17 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-30 21:36:14 +0100 |
commit | 03813f4870e2d6e6f4b97d643352eb42887ce99a (patch) | |
tree | e39176506e6f46952849567e6f9188cc285d6a99 /meta/recipes-devtools | |
parent | 3956c7bd34f5c409e1fc161d8cbbcb2358df7437 (diff) | |
download | poky-03813f4870e2d6e6f4b97d643352eb42887ce99a.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.20.0.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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() { | |||
189 | sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" ext/Errno/Errno_pm.PL | 189 | sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" ext/Errno/Errno_pm.PL |
190 | sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" cpan/Compress-Raw-Zlib/config.in | 190 | sed -i -e "s|\([ \"\']\+\)/usr/include|\1${STAGING_INCDIR}|g" cpan/Compress-Raw-Zlib/config.in |
191 | sed -i -e 's|/usr/lib|""|g' cpan/Compress-Raw-Zlib/config.in | 191 | sed -i -e 's|/usr/lib|""|g' cpan/Compress-Raw-Zlib/config.in |
192 | sed -i -e 's|SYSROOTLIB|${STAGING_LIBDIR}|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm | 192 | sed -i -e 's|(@libpath, ".*"|(@libpath, "${STAGING_LIBDIR}"|g' cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm |
193 | 193 | ||
194 | cd Cross | 194 | cd Cross |
195 | oe_runmake perl LD="${CCLD}" | 195 | oe_runmake perl LD="${CCLD}" |