summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/boost
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-09-29 23:16:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-30 15:01:46 +0100
commit6ee1b1e6d65214ab32030ee4b37997f8a9871f25 (patch)
tree3ce1d3e7e608ccc97b3ab119cec482f20f054505 /meta/recipes-support/boost
parent0f5d9d8cc5d05a7a485e4cb89b37d06ea0d05d23 (diff)
downloadopenembedded-core-6ee1b1e6d65214ab32030ee4b37997f8a9871f25.tar.gz
openembedded-core-6ee1b1e6d65214ab32030ee4b37997f8a9871f25.tar.bz2
openembedded-core-6ee1b1e6d65214ab32030ee4b37997f8a9871f25.zip
boost: move the build directory outside of S
Instead of manually creating and deleting build directories, follow the idioms by setting B to WORKDIR/build, setting do_configure[cleandirs], and using ${B} where appropriate. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r--meta/recipes-support/boost/boost.inc12
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index ca140d595f..ea1bc123b8 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -7,6 +7,9 @@ CVE_PRODUCT = "boost:boost"
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
+B = "${WORKDIR}/build"
+do_configure[cleandirs] = "${B}"
+
BOOST_LIBS = "\
atomic \
chrono \
@@ -146,7 +149,7 @@ BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}"
BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \
${BJAM_TOOLS} \
-sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \
- --build-dir=${S}/${TARGET_SYS} \
+ --build-dir=${B} \
--disable-icu \
${BJAM_EXTRA}'
@@ -161,6 +164,7 @@ BJAM_OPTS_append_arm = " abi=aapcs architecture=arm"
BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm"
do_configure() {
+ cd ${S}
cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp
# D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation.
@@ -184,8 +188,9 @@ do_configure() {
}
do_compile() {
- rm -rf ${S}/${TARGET_SYS}
- bjam ${BJAM_OPTS} --prefix=${prefix} \
+ cd ${S}
+ bjam ${BJAM_OPTS} \
+ --prefix=${prefix} \
--exec-prefix=${exec_prefix} \
--libdir=${libdir} \
--includedir=${includedir} \
@@ -193,6 +198,7 @@ do_compile() {
}
do_install() {
+ cd ${S}
bjam ${BJAM_OPTS} \
--libdir=${D}${libdir} \
--includedir=${D}${includedir} \