boost: various cleanups
Re-order some assignments to be logically arranged. Remove the set -ex statements as they serve no purpose. Pass --debug-configuration to see what configuration steps boost is taking. (From OE-Core rev: 2dc4796f02ecdc99ee3c51c668e8d9090e68a655) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
814e960d37
commit
85293a044f
|
@ -69,7 +69,6 @@ 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}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*"
|
||||||
FILES_${PN}-locale = "${libdir}/libboost_locale.so.*"
|
FILES_${PN}-locale = "${libdir}/libboost_locale.so.*"
|
||||||
FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*"
|
FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*"
|
||||||
|
@ -80,15 +79,15 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \
|
||||||
|
|
||||||
# -dev last to pick up the remaining stuff
|
# -dev last to pick up the remaining stuff
|
||||||
PACKAGES += "${PN}-dev ${PN}-staticdev"
|
PACKAGES += "${PN}-dev ${PN}-staticdev"
|
||||||
FILES_${PN} = ""
|
|
||||||
FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so"
|
FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so"
|
||||||
FILES_${PN}-staticdev = "${libdir}/libboost_*.a"
|
FILES_${PN}-staticdev = "${libdir}/libboost_*.a"
|
||||||
|
|
||||||
# "boost" is a metapackage which pulls in all boost librabries
|
# "boost" is a metapackage which pulls in all boost librabries
|
||||||
PACKAGES += "${PN}"
|
PACKAGES += "${PN}"
|
||||||
|
FILES_${PN} = ""
|
||||||
|
ALLOW_EMPTY_${PN} = "1"
|
||||||
RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
|
RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
|
||||||
RRECOMMENDS_${PN}_class-native = ""
|
RRECOMMENDS_${PN}_class-native = ""
|
||||||
ALLOW_EMPTY_${PN} = "1"
|
|
||||||
|
|
||||||
# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
|
# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
|
||||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||||
|
@ -196,16 +195,15 @@ do_configure() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_compile() {
|
do_compile() {
|
||||||
set -ex
|
|
||||||
rm -rf ${S}/${TARGET_SYS}
|
rm -rf ${S}/${TARGET_SYS}
|
||||||
bjam ${BJAM_OPTS} --prefix=${prefix} \
|
bjam ${BJAM_OPTS} --prefix=${prefix} \
|
||||||
--exec-prefix=${exec_prefix} \
|
--exec-prefix=${exec_prefix} \
|
||||||
--libdir=${libdir} \
|
--libdir=${libdir} \
|
||||||
--includedir=${includedir}
|
--includedir=${includedir} \
|
||||||
|
--debug-configuration
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
set -ex
|
|
||||||
bjam ${BJAM_OPTS} \
|
bjam ${BJAM_OPTS} \
|
||||||
--libdir=${D}${libdir} \
|
--libdir=${D}${libdir} \
|
||||||
--includedir=${D}${includedir} \
|
--includedir=${D}${includedir} \
|
||||||
|
|
Loading…
Reference in New Issue