From 3d3893d26191307e99a261064885aeaf1e4c1ec7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 Sep 2012 14:15:30 +0100 Subject: perl: Fix substitution madness We're going around in circles trying to fix the sed expressions and making one case work and others not work. This patch fixes the base configuration file so we have non-overlapping substitutions. I've tried to significantly clean up various problems that were occurring once and for all. This will hopefully resolve all the issues people have been seeing with incorrect perl paths. (From OE-Core rev: 31ff70794ecc431431476f81c8934fff25383613) Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/perl_5.14.2.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools/perl/perl_5.14.2.bb') diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb index 00098553dd..09b2acb191 100644 --- a/meta/recipes-devtools/perl/perl_5.14.2.bb +++ b/meta/recipes-devtools/perl/perl_5.14.2.bb @@ -146,14 +146,14 @@ do_configure() { ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)} # Update some paths in the configuration - sed -i -e 's,@DESTDIR@,${prefix},g' \ - -e 's,@ARCH@-thread-multi,,g' \ + sed -i -e 's,@ARCH@-thread-multi,,g' \ -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ -e 's,@STAGINGDIR@,${STAGING_DIR_HOST},g' \ - -e "s%\([ \"^\',=]\+\)/usr/include\([ \"^\',=]\+\)%\1${STAGING_INCDIR}\2%g" \ - -e "s%\([ \"^\',=]\+\)/usr/lib/\([ \"^\',=]\+\)%\1${libdir}/\2%g" \ - -e "s%\([ \"^\',=]\+\)/usr/\([ \"^\',=]\+\)%\1${exec_prefix}/\2%g" \ - -e "s%/perl5%/perl%g" \ + -e "s,@INCLUDEDIR@,${STAGING_INCDIR},g" \ + -e "s,@LIBDIR@,${libdir},g" \ + -e "s,@BASELIBDIR@,${base_libdir},g" \ + -e "s,@EXECPREFIX@,${exec_prefix},g" \ + -e 's,@USRBIN@,${bindir},g' \ config.sh-${TARGET_ARCH}-${TARGET_OS} case "${TARGET_ARCH}" in -- cgit v1.2.3-54-g00ecf