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:26:08 +0100 |
| commit | b1d8f59027092f58b021b8fa3ccfe1598105239d (patch) | |
| tree | 53a1c500bcb5e0ff25ca36df7e824a35a7fd4020 /meta/recipes-support/boost/boost.inc | |
| parent | b8dd7c82bcd7c229e1203b827294a06918b064fb (diff) | |
| download | poky-b1d8f59027092f58b021b8fa3ccfe1598105239d.tar.gz | |
boost: Upgrade to 1.56.0
Rebase boostconfig to handle moved user-config file
(From OE-Core rev: a6afd754290cecbe57392d13477557051b438817)
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): | |||
| 120 | BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" | 120 | BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" |
| 121 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ | 121 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ |
| 122 | ${BJAM_TOOLS} \ | 122 | ${BJAM_TOOLS} \ |
| 123 | -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/v2/user-config.jam \ | 123 | -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ |
| 124 | --builddir=${S}/${TARGET_SYS} \ | 124 | --builddir=${S}/${TARGET_SYS} \ |
| 125 | --disable-icu \ | 125 | --disable-icu \ |
| 126 | ${BJAM_EXTRA}' | 126 | ${BJAM_EXTRA}' |
| @@ -132,12 +132,12 @@ do_boostconfig() { | |||
| 132 | cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp | 132 | cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp |
| 133 | 133 | ||
| 134 | # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. | 134 | # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. |
| 135 | if ! grep -qe "^using gcc : 4.3.1" ${S}/tools/build/v2/user-config.jam | 135 | if ! grep -qe "^using gcc : 4.3.1" ${S}/tools/build/example/user-config.jam |
| 136 | then | 136 | then |
| 137 | echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/v2/user-config.jam | 137 | echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam |
| 138 | fi | 138 | fi |
| 139 | 139 | ||
| 140 | echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/v2/user-config.jam | 140 | echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam |
| 141 | 141 | ||
| 142 | CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} | 142 | CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} |
| 143 | sed -i '/^using python/d' project-config.jam | 143 | sed -i '/^using python/d' project-config.jam |