diff options
| author |   Ross Burton <ross.burton@intel.com> | 2017-03-24 16:09:27 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-26 13:17:02 +0100 |
| commit | 2dc4796f02ecdc99ee3c51c668e8d9090e68a655 (patch) | |
| tree | 04418624a246490528913feaa7f8de8ee40746ab | |
| parent | 0f5418eb0ce12811b16d2e3c28c28140a509f685 (diff) | |
| download | openembedded-core-contrib-2dc4796f02ecdc99ee3c51c668e8d9090e68a655.tar.gz | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/boost/boost.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index dcadcbcc42..4ff70e399b 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -69,7 +69,6 @@ python __anonymous () { } # 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.*" @@ -80,15 +79,15 @@ 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" # "boost" is a metapackage which pulls in all boost librabries PACKAGES += "${PN}" +FILES_${PN} = "" +ALLOW_EMPTY_${PN} = "1" RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" 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 TARGET_CC_ARCH += "${LDFLAGS}" @@ -196,16 +195,15 @@ do_configure() { } do_compile() { - set -ex rm -rf ${S}/${TARGET_SYS} bjam ${BJAM_OPTS} --prefix=${prefix} \ --exec-prefix=${exec_prefix} \ --libdir=${libdir} \ - --includedir=${includedir} + --includedir=${includedir} \ + --debug-configuration } do_install() { - set -ex bjam ${BJAM_OPTS} \ --libdir=${D}${libdir} \ --includedir=${D}${includedir} \ |