mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

boost: Upgrade to 1.56.0

Browse Source 
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>
This commit is contained in:
Saul Wold
2014-08-19 07:49:09 -07:00
committed by Richard Purdie
parent b8dd7c82bc
commit b1d8f59027
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
meta/recipes-support/boost/bjam-native_1.55.0.bb → meta/recipes-support/boost/bjam-native_1.56.0.bb
View File

4
meta/recipes-support/boost/boost-1.55.0.inc → meta/recipes-support/boost/boost-1.56.0.inc
View File

@@ -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}"

8
meta/recipes-support/boost/boost.inc
View File

@@ -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

0
meta/recipes-support/boost/boost_1.55.0.bb → meta/recipes-support/boost/boost_1.56.0.bb
View File