diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-08 19:33:23 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:27 +0000 |
| commit | f1faef3e6b4ac3026bef189534a9ffde9a3b696c (patch) | |
| tree | 2bab36aef02bb419830a2f7e2f930a9951ec19ba | |
| parent | 22ddc76b2fded4f8c62872d7644ae4c6e9f96bcb (diff) | |
| download | openembedded-core-f1faef3e6b4ac3026bef189534a9ffde9a3b696c.tar.gz openembedded-core-f1faef3e6b4ac3026bef189534a9ffde9a3b696c.tar.bz2 openembedded-core-f1faef3e6b4ac3026bef189534a9ffde9a3b696c.tar.xz openembedded-core-f1faef3e6b4ac3026bef189534a9ffde9a3b696c.zip | |
icu: Fix -native version so it doesn't use target substituions in configure step
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/icu/icu-3.6.inc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc index 90b4729bf..e8d4f48d2 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() { |