diff options
author | Ross Burton <ross@burtonini.com> | 2020-10-06 12:14:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-08 10:22:10 +0100 |
commit | af7b126c7a18fd81fd397fc8e3823fb63e91566f (patch) | |
tree | 9f60860c4e5c6788d4129e10a88ae8ab6fa015d3 /meta/recipes-support/boost/boost.inc | |
parent | b6d30c21b09e3cd8488868804e7d34e13243a26a (diff) | |
download | poky-af7b126c7a18fd81fd397fc8e3823fb63e91566f.tar.gz |
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>
Diffstat (limited to 'meta/recipes-support/boost/boost.inc')
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 8 |
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 @@ | |||
1 | SUMMARY = "Free peer-reviewed portable C++ source libraries" | 1 | SUMMARY = "Free peer-reviewed portable C++ source libraries" |
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | DEPENDS = "bjam-native zlib bzip2" | 3 | DEPENDS = "boost-build-native zlib bzip2" |
4 | 4 | ||
5 | CVE_PRODUCT = "boost:boost" | 5 | CVE_PRODUCT = "boost:boost" |
6 | 6 | ||
@@ -180,7 +180,7 @@ do_configure() { | |||
180 | echo "using mpi : : <find-shared-library>mpi ;" >> ${WORKDIR}/user-config.jam | 180 | echo "using mpi : : <find-shared-library>mpi ;" >> ${WORKDIR}/user-config.jam |
181 | fi | 181 | fi |
182 | 182 | ||
183 | CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc | 183 | CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=b2 --with-toolset=gcc |
184 | 184 | ||
185 | # Boost can't be trusted to find Python on it's own, so remove any mention | 185 | # Boost can't be trusted to find Python on it's own, so remove any mention |
186 | # of it from the boost configuration | 186 | # of it from the boost configuration |
@@ -189,7 +189,7 @@ do_configure() { | |||
189 | 189 | ||
190 | do_compile() { | 190 | do_compile() { |
191 | cd ${S} | 191 | cd ${S} |
192 | bjam ${BJAM_OPTS} \ | 192 | b2 ${BJAM_OPTS} \ |
193 | --prefix=${prefix} \ | 193 | --prefix=${prefix} \ |
194 | --exec-prefix=${exec_prefix} \ | 194 | --exec-prefix=${exec_prefix} \ |
195 | --libdir=${libdir} \ | 195 | --libdir=${libdir} \ |
@@ -199,7 +199,7 @@ do_compile() { | |||
199 | 199 | ||
200 | do_install() { | 200 | do_install() { |
201 | cd ${S} | 201 | cd ${S} |
202 | bjam ${BJAM_OPTS} \ | 202 | b2 ${BJAM_OPTS} \ |
203 | --libdir=${D}${libdir} \ | 203 | --libdir=${D}${libdir} \ |
204 | --includedir=${D}${includedir} \ | 204 | --includedir=${D}${includedir} \ |
205 | install | 205 | install |