summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/boost
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-19 17:20:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:41:42 +0100
commite717e28eda703e7b0d3e6513be9e2919de4eec2d (patch)
treeb5622a3304fa4d18202daf1dda52ba758343de13 /meta/recipes-support/boost
parentff61a85642a33b27546d3d462a6b7952e2940538 (diff)
downloadpoky-e717e28eda703e7b0d3e6513be9e2919de4eec2d.tar.gz
boost: improve configure
Instead of adding a custom task (do_boostconfig) simply use the existing do_configure. Ensure that there are no relative paths in do_configure. Instead of editing the user-config.jam sample file in the source tree (which is entirely comments) and extending it on every build, create a new user-config.jam in ${WORKDIR}. (From OE-Core rev: 1f3cfc77f1dcbfffd319f09591814611f7a5c6bf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r--meta/recipes-support/boost/boost.inc20
1 files changed, 8 insertions, 12 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 92c7bcb215..5696b6adb6 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -142,7 +142,7 @@ def get_boost_parallel_make(d):
142BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(d)}" 142BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(d)}"
143BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ 143BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \
144 ${BJAM_TOOLS} \ 144 ${BJAM_TOOLS} \
145 -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ 145 -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \
146 --build-dir=${S}/${TARGET_SYS} \ 146 --build-dir=${S}/${TARGET_SYS} \
147 --disable-icu \ 147 --disable-icu \
148 ${BJAM_EXTRA}' 148 ${BJAM_EXTRA}'
@@ -150,23 +150,19 @@ BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \
150# Native compilation of bzip2 isn't working 150# Native compilation of bzip2 isn't working
151BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' 151BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1'
152 152
153do_boostconfig() { 153do_configure() {
154 cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp 154 cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp
155 155
156 # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. 156 # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation.
157 sed -i "/^using gcc : 4.3.1/d" ${S}/tools/build/example/user-config.jam 157 rm -f ${WORKDIR}/user-config.jam
158 sed -i "/^using python : ${PYTHON_BASEVERSION}"/d ${S}/tools/build/example/user-config.jam 158 echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${WORKDIR}/user-config.jam
159 echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam 159 echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${WORKDIR}/user-config.jam
160 echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam 160 echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${WORKDIR}/user-config.jam
161 echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${S}/tools/build/example/user-config.jam
162 161
163 CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} 162 CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT}
164 sed -i '/^using python/d' project-config.jam 163 sed -i '/^using python/d' ${S}/project-config.jam
165} 164}
166 165
167do_boostconfig[dirs] = "${S}"
168addtask do_boostconfig after do_patch before do_configure
169
170do_compile() { 166do_compile() {
171 set -ex 167 set -ex
172 rm -rf ${S}/${TARGET_SYS} 168 rm -rf ${S}/${TARGET_SYS}