summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-03-24 16:09:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-27 08:15:06 +0100
commit85293a044f7056a64eeec5096858783788aa3db9 (patch)
tree37f4904a180b3d5f0d2f6dc62ea9d42a9007e77f
parent814e960d379ec38ab32c161e4028fde66bab0dd9 (diff)
downloadpoky-85293a044f7056a64eeec5096858783788aa3db9.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. (From OE-Core rev: 2dc4796f02ecdc99ee3c51c668e8d9090e68a655) 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.inc10
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 () {
69} 69}
70 70
71# Override the contents of specific packages 71# Override the contents of specific packages
72FILES_${PN}-graph = "${libdir}/libboost_graph.so.*"
73FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" 72FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*"
74FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" 73FILES_${PN}-locale = "${libdir}/libboost_locale.so.*"
75FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" 74FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*"
@@ -80,15 +79,15 @@ FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \
80 79
81# -dev last to pick up the remaining stuff 80# -dev last to pick up the remaining stuff
82PACKAGES += "${PN}-dev ${PN}-staticdev" 81PACKAGES += "${PN}-dev ${PN}-staticdev"
83FILES_${PN} = ""
84FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so" 82FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so"
85FILES_${PN}-staticdev = "${libdir}/libboost_*.a" 83FILES_${PN}-staticdev = "${libdir}/libboost_*.a"
86 84
87# "boost" is a metapackage which pulls in all boost librabries 85# "boost" is a metapackage which pulls in all boost librabries
88PACKAGES += "${PN}" 86PACKAGES += "${PN}"
87FILES_${PN} = ""
88ALLOW_EMPTY_${PN} = "1"
89RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" 89RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
90RRECOMMENDS_${PN}_class-native = "" 90RRECOMMENDS_${PN}_class-native = ""
91ALLOW_EMPTY_${PN} = "1"
92 91
93# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works 92# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
94TARGET_CC_ARCH += "${LDFLAGS}" 93TARGET_CC_ARCH += "${LDFLAGS}"
@@ -196,16 +195,15 @@ do_configure() {
196} 195}
197 196
198do_compile() { 197do_compile() {
199 set -ex
200 rm -rf ${S}/${TARGET_SYS} 198 rm -rf ${S}/${TARGET_SYS}
201 bjam ${BJAM_OPTS} --prefix=${prefix} \ 199 bjam ${BJAM_OPTS} --prefix=${prefix} \
202 --exec-prefix=${exec_prefix} \ 200 --exec-prefix=${exec_prefix} \
203 --libdir=${libdir} \ 201 --libdir=${libdir} \
204 --includedir=${includedir} 202 --includedir=${includedir} \
203 --debug-configuration
205} 204}
206 205
207do_install() { 206do_install() {
208 set -ex
209 bjam ${BJAM_OPTS} \ 207 bjam ${BJAM_OPTS} \
210 --libdir=${D}${libdir} \ 208 --libdir=${D}${libdir} \
211 --includedir=${D}${includedir} \ 209 --includedir=${D}${includedir} \