[oe-commits] Marcin Juszkiewicz : cpan.bbclass: use '|' as sed separator for entry with paths

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dylan
Commit: bb94a3fbdd9b10fcece73798e7a40ff211ebbd5c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bb94a3fbdd9b10fcece73798e7a40ff211ebbd5c

Author: Marcin Juszkiewicz <marcin.juszkiewicz at linaro.org>
Date:   Wed Apr 24 15:45:42 2013 +0200

cpan.bbclass: use '|' as sed separator for entry with paths

With normal toolchain it works. But fails badly when external Linaro
toolchain is used. And this is why:

-e "s/^\(CCFLAGS =.*\)/\1  -isystem/home/hrw/devel/canonical/aarch64/openembedded/build/linaro-tcwg/gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux//aarch64-linux-gnu/include  -O2 -pipe -g -feliminate-unused-debug-types/" \

(From OE-Core master rev: f6244a9d3da7c301f19efc114c2aaf39e5eec299)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz at linaro.org>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/cpan.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 957a6e2..bef9e82 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -26,7 +26,7 @@ cpan_do_configure () {
 			test -f $f2 || continue
 			sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \
 				-e 's/perl.real/perl/' \
-				-e "s/^\(CCFLAGS =.*\)/\1 ${CFLAGS}/" \
+				-e "s|^\(CCFLAGS =.*\)|\1 ${CFLAGS}|" \
 				$f2
 		done
 	fi