boost: build a standalone boost.build

Boost is a huge unirepo made from multiple submodules. To bootstrap it we
need boost.build (previously bjam) which is also available as a solo
repository. This smaller repository can unpack/build/package faster than
the Boost unirepo can unpack.

Rename the recipe to the current name of Boost.Build that installs a b2
binary, use the solo repository, and update the Boost recipe to use
the b2 binary instead of bjam.

(From OE-Core rev: 76079f921e596125b0e281ca95e2394d7688aaf2)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index ea1bc123b8..e74c7d6f7d 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -1,6 +1,6 @@
 SUMMARY = "Free peer-reviewed portable C++ source libraries"
 SECTION = "libs"
-DEPENDS = "bjam-native zlib bzip2"
+DEPENDS = "boost-build-native zlib bzip2"
 
 CVE_PRODUCT = "boost:boost"
 
@@ -180,7 +180,7 @@ do_configure() {
                 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
+        CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=b2 --with-toolset=gcc
 
         # Boost can't be trusted to find Python on it's own, so remove any mention
         # of it from the boost configuration
@@ -189,7 +189,7 @@ do_configure() {
 
 do_compile() {
         cd ${S}
-        bjam ${BJAM_OPTS} \
+        b2 ${BJAM_OPTS} \
                 --prefix=${prefix} \
                 --exec-prefix=${exec_prefix} \
                 --libdir=${libdir} \
@@ -199,7 +199,7 @@ do_compile() {
 
 do_install() {
         cd ${S}
-        bjam ${BJAM_OPTS} \
+        b2 ${BJAM_OPTS} \
                 --libdir=${D}${libdir} \
                 --includedir=${D}${includedir} \
                 install