diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-19 17:20:19 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-29 07:34:10 +0100 |
| commit | 1f3cfc77f1dcbfffd319f09591814611f7a5c6bf (patch) | |
| tree | ee6fd4e720a943902fd14639e88eb078210f35a8 /meta/recipes-support | |
| parent | e96b6d73e0842e559810e780f20e49267ebb686e (diff) | |
| download | openembedded-core-contrib-1f3cfc77f1dcbfffd319f09591814611f7a5c6bf.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}.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/boost/boost.inc | 20 |
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): BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(d)}" BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_TOOLS} \ - -sBOOST_BUILD_USER_CONFIG=${S}/tools/build/example/user-config.jam \ + -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ --build-dir=${S}/${TARGET_SYS} \ --disable-icu \ ${BJAM_EXTRA}' @@ -150,23 +150,19 @@ BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ # Native compilation of bzip2 isn't working BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' -do_boostconfig() { - cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp +do_configure() { + cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. - sed -i "/^using gcc : 4.3.1/d" ${S}/tools/build/example/user-config.jam - sed -i "/^using python : ${PYTHON_BASEVERSION}"/d ${S}/tools/build/example/user-config.jam - echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam - echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam - echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${S}/tools/build/example/user-config.jam + rm -f ${WORKDIR}/user-config.jam + echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${WORKDIR}/user-config.jam + echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${WORKDIR}/user-config.jam + echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${WORKDIR}/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 + sed -i '/^using python/d' ${S}/project-config.jam } -do_boostconfig[dirs] = "${S}" -addtask do_boostconfig after do_patch before do_configure - do_compile() { set -ex rm -rf ${S}/${TARGET_SYS} |