From f1faef3e6b4ac3026bef189534a9ffde9a3b696c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Nov 2009 19:33:23 +0000 Subject: icu: Fix -native version so it doesn't use target substituions in configure step Signed-off-by: Richard Purdie --- meta/packages/icu/icu-3.6.inc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc index 90b4729bfc..e8d4f48d22 100644 --- a/meta/packages/icu/icu-3.6.inc +++ b/meta/packages/icu/icu-3.6.inc @@ -17,12 +17,16 @@ do_configure() { libtoolize --force gnu-configize --force oe_runconf - for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do - sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i - sed -i -e 's:$(BINDIR)/::g' $i - done - sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true - sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true + if [ "${BUILD_ARCH}" != "${HOST_ARCH" ]; then + # In the non-native case we need to make substitutions to use + # the native versions of the tools + for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do + sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i + sed -i -e 's:$(BINDIR)/::g' $i + done + sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true + sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true + fi } do_compile() { -- cgit v1.2.3