diff options
Diffstat (limited to 'yocto-poky/meta/recipes-support/boost/boost.inc')
| -rw-r--r-- | yocto-poky/meta/recipes-support/boost/boost.inc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/yocto-poky/meta/recipes-support/boost/boost.inc b/yocto-poky/meta/recipes-support/boost/boost.inc index 3288e845f..982446c06 100644 --- a/yocto-poky/meta/recipes-support/boost/boost.inc +++ b/yocto-poky/meta/recipes-support/boost/boost.inc @@ -2,7 +2,8 @@ SUMMARY = "Free peer-reviewed portable C++ source libraries" SECTION = "libs" DEPENDS = "bjam-native zlib bzip2" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" BOOST_LIBS = "\ atomic \ @@ -18,6 +19,7 @@ BOOST_LIBS = "\ serialization \ signals \ system \ + timer \ test \ thread \ " @@ -59,6 +61,7 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev ${PN}-staticdev" +FILES_${PN} = "" FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so" FILES_${PN}-staticdev = "${libdir}/libboost_*.a" @@ -112,9 +115,9 @@ BJAM_TOOLS = "--ignore-site-config \ '--layout=system' \ " -# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater paralelism causes bjam to segfault or to ignore -j +# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j # https://svn.boost.org/trac/boost/ticket/7634 -def get_boost_parallel_make(bb, d): +def get_boost_parallel_make(d): pm = d.getVar('PARALLEL_MAKE', True) if pm: # look for '-j' and throw other options (e.g. '-l') away @@ -136,11 +139,11 @@ def get_boost_parallel_make(bb, d): return "" -BOOST_PARALLEL_MAKE = "${@get_boost_parallel_make(bb, d)}" -BJAM_OPTS = '${BOOST_PARALLEL_MAKE} \ +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 \ - --builddir=${S}/${TARGET_SYS} \ + --build-dir=${S}/${TARGET_SYS} \ --disable-icu \ ${BJAM_EXTRA}' @@ -155,7 +158,7 @@ do_boostconfig() { 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.4 : : ${STAGING_INCDIR}/python3.4m ;" >> ${S}/tools/build/example/user-config.jam + echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${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 |