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 | |
| parent | 55ae27e1fa77dc2f10a40051ac67e933116f874c (diff) | |
| download | openembedded-core-a6afd754290cecbe57392d13477557051b438817.tar.gz openembedded-core-a6afd754290cecbe57392d13477557051b438817.tar.bz2 openembedded-core-a6afd754290cecbe57392d13477557051b438817.zip | |
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')
| -rw-r--r-- | meta/recipes-support/boost/bjam-native_1.56.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.55.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost-1.56.0.inc (renamed from meta/recipes-support/boost/boost-1.55.0.inc) | 4 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost_1.56.0.bb (renamed from meta/recipes-support/boost/boost_1.55.0.bb) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.55.0.bb b/meta/recipes-support/boost/bjam-native_1.56.0.bb index d85d1a96cb..d85d1a96cb 100644 --- a/meta/recipes-support/boost/bjam-native_1.55.0.bb +++ b/meta/recipes-support/boost/bjam-native_1.56.0.bb diff --git a/meta/recipes-support/boost/boost-1.55.0.inc b/meta/recipes-support/boost/boost-1.56.0.inc index 7daadb6c9e..24c32b4c6f 100644 --- a/meta/recipes-support/boost/boost-1.55.0.inc +++ b/meta/recipes-support/boost/boost-1.56.0.inc @@ -13,7 +13,7 @@ BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "d6eef4b4cacb2183f2bf265a5a03a354" -SRC_URI[sha256sum] = "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52" +SRC_URI[md5sum] = "a744cf167b05d72335f27c88115f211d" +SRC_URI[sha256sum] = "134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d" S = "${WORKDIR}/${BOOST_P}" 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 diff --git a/meta/recipes-support/boost/boost_1.55.0.bb b/meta/recipes-support/boost/boost_1.56.0.bb index b199c88577..b199c88577 100644 --- a/meta/recipes-support/boost/boost_1.55.0.bb +++ b/meta/recipes-support/boost/boost_1.56.0.bb |