From 7b743641209492476329b88dcb213fbbd1780a9f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 4 Aug 2010 10:13:25 +0100 Subject: icu: Make sure changes apply to Makefile and Makefile.in to fix build failure Signed-off-by: Richard Purdie --- meta/packages/icu/icu-3.6.inc | 6 ++---- meta/packages/icu/icu_3.6.bb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'meta') diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc index aa654f768..1c611bdf3 100644 --- a/meta/packages/icu/icu-3.6.inc +++ b/meta/packages/icu/icu-3.6.inc @@ -24,15 +24,13 @@ do_configure() { libtoolize --force gnu-configize --force oe_runconf - if [ "${BUILD_ARCH}" != "${HOST_ARCH}" ]; then + if [ "${PN}" != "icu-native" ]; 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 + for i in */Makefile* */*.inc */*/Makefile* */*/*.inc */*/*.inc.in ; 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 } diff --git a/meta/packages/icu/icu_3.6.bb b/meta/packages/icu/icu_3.6.bb index 7938dc63d..504211600 100644 --- a/meta/packages/icu/icu_3.6.bb +++ b/meta/packages/icu/icu_3.6.bb @@ -1,3 +1,3 @@ require icu-3.6.inc -PR = "r5" +PR = "r6" -- cgit v1.2.3