From: Ignacy Gawedzki <i@lri.fr>
Date: Thu, 7 Feb 2013 03:48:35 +0000 (+0000)
Subject: boost: Pass staging dir to --with-icu option.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5946dcfc582370fa8b55f06517a98bac2b2c1c1e;p=buildroot.git

boost: Pass staging dir to --with-icu option.

When using the --with-icu option without specifying the directory, boost's
bootstrap.sh script will look at "common" locations (lines 289-294):

    COMMON_ICU_PATHS="/usr /usr/local /sw"
    for p in $COMMON_ICU_PATHS; do
      if test -r $p/include/unicode/utypes.h; then
        ICU_ROOT=$p
      fi
    done

With buildroot it may surely become problematic at some point.

Signed-off-by: Ignacy Gawędzki <i@lri.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 5e1bb4e248..a2028484b4 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -39,7 +39,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave)
 
 ifeq ($(BR2_PACKAGE_ICU),y)
-BOOST_FLAGS += --with-icu
+BOOST_FLAGS += --with-icu=$(STAGING_DIR)/usr
 BOOST_DEPENDENCIES += icu
 else
 BOOST_FLAGS += --without-icu