diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-08-19 07:49:09 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 09:25:03 +0100 |
commit | a6afd754290cecbe57392d13477557051b438817 (patch) | |
tree | 91f94cb78dcdbb30b8a6945088a714cb9cce1921 /meta/recipes-support/boost/boost.inc | |
parent | 55ae27e1fa77dc2f10a40051ac67e933116f874c (diff) | |
download | openembedded-core-contrib-a6afd754290cecbe57392d13477557051b438817.tar.gz |
boost: Upgrade to 1.56.0
Rebase boostconfig to handle moved user-config file
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost/boost.inc')
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 0a44d79746..ad1bc76184 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -120,7 +120,7 @@ def get_boost_parallel_make(bb, d): BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ ${BJAM_TOOLS} \ - -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/v2/user-config.jam \ + -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ --builddir=${S}/${TARGET_SYS} \ --disable-icu \ ${BJAM_EXTRA}' @@ -132,12 +132,12 @@ do_boostconfig() { cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. - if ! grep -qe "^using gcc : 4.3.1" ${S}/tools/build/v2/user-config.jam + if ! grep -qe "^using gcc : 4.3.1" ${S}/tools/build/example/user-config.jam then - echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/v2/user-config.jam + echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam fi - echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/v2/user-config.jam + echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} sed -i '/^using python/d' project-config.jam |