boost: add support for additional boost libs
* Added libs: - container - context - coroutine - exception - graph_parallel - locale - math - mpi - wave * Add PACKAGECONFIG to add proper dependencies for: graph_parallel, locale, and mpi. * boost-mpi depends on mpich which is in meta-oe, and boost-graph_parallel depends on boost-mpi, so they are disabled by default, but can be enabled in a distro that needs them. * context and coroutine are added only for x86 and powerpc. (From OE-Core rev: a715a4ef10eed0ccffac1c38af89e16090d8159e) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
55cab158e4
commit
b7fac3f260
|
@ -8,11 +8,14 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
|
||||||
BOOST_LIBS = "\
|
BOOST_LIBS = "\
|
||||||
atomic \
|
atomic \
|
||||||
chrono \
|
chrono \
|
||||||
|
container \
|
||||||
date_time \
|
date_time \
|
||||||
|
exception \
|
||||||
filesystem \
|
filesystem \
|
||||||
graph \
|
graph \
|
||||||
iostreams \
|
iostreams \
|
||||||
log \
|
log \
|
||||||
|
math \
|
||||||
program_options \
|
program_options \
|
||||||
random \
|
random \
|
||||||
regex \
|
regex \
|
||||||
|
@ -22,12 +25,28 @@ BOOST_LIBS = "\
|
||||||
timer \
|
timer \
|
||||||
test \
|
test \
|
||||||
thread \
|
thread \
|
||||||
|
wave \
|
||||||
"
|
"
|
||||||
|
|
||||||
# optional boost-python library
|
# only supported by x86 and powerpc
|
||||||
PACKAGECONFIG ??= ""
|
BOOST_LIBS_append_x86 = " context coroutine"
|
||||||
|
BOOST_LIBS_append_x86-64 = " context coroutine"
|
||||||
|
BOOST_LIBS_append_powerpc = " context coroutine"
|
||||||
|
|
||||||
|
# optional libraries
|
||||||
|
PACKAGECONFIG ??= "locale"
|
||||||
|
PACKAGECONFIG[locale] = ",,icu"
|
||||||
|
PACKAGECONFIG[graph_parallel] = ",,,boost-mpi mpich"
|
||||||
|
PACKAGECONFIG[mpi] = ",,mpich"
|
||||||
PACKAGECONFIG[python] = ",,python python3"
|
PACKAGECONFIG[python] = ",,python python3"
|
||||||
BOOST_LIBS += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)}"
|
|
||||||
|
BOOST_LIBS += "\
|
||||||
|
${@bb.utils.contains('PACKAGECONFIG', 'locale', 'locale', '', d)} \
|
||||||
|
${@bb.utils.contains('PACKAGECONFIG', 'graph_parallel', 'graph_parallel mpi', \
|
||||||
|
bb.utils.contains('PACKAGECONFIG', 'mpi', 'mpi', '', d), d)} \
|
||||||
|
${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)} \
|
||||||
|
"
|
||||||
|
|
||||||
inherit python-dir
|
inherit python-dir
|
||||||
PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}"
|
PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}"
|
||||||
|
|
||||||
|
@ -54,6 +73,10 @@ python __anonymous () {
|
||||||
}
|
}
|
||||||
|
|
||||||
# Override the contents of specific packages
|
# Override the contents of specific packages
|
||||||
|
FILES_${PN}-graph = "${libdir}/libboost_graph.so.*"
|
||||||
|
FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*"
|
||||||
|
FILES_${PN}-locale = "${libdir}/libboost_locale.so.*"
|
||||||
|
FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*"
|
||||||
FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \
|
FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \
|
||||||
${libdir}/libboost_wserialization*.so.*"
|
${libdir}/libboost_wserialization*.so.*"
|
||||||
FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \
|
FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \
|
||||||
|
@ -159,6 +182,10 @@ do_configure() {
|
||||||
echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${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
|
echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${WORKDIR}/user-config.jam
|
||||||
|
|
||||||
|
if ${@bb.utils.contains('BOOST_LIBS', 'mpi', 'true', 'false', d)}; then
|
||||||
|
echo "using mpi : : <find-shared-library>mpi ;" >> ${WORKDIR}/user-config.jam
|
||||||
|
fi
|
||||||
|
|
||||||
CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT}
|
CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT}
|
||||||
sed -i '/^using python/d' ${S}/project-config.jam
|
sed -i '/^using python/d' ${S}/project-config.jam
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue