diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2020-06-20 21:02:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-23 12:31:03 +0100 |
commit | 441a899ac99d354def8b89230be683c372f52aea (patch) | |
tree | d1201cefb02a87ca343a9b2f8cd794c799aaeee6 /meta/recipes-support/boost | |
parent | 2d740a8c710a001d7de48881fb3ec227f4e25c92 (diff) | |
download | poky-441a899ac99d354def8b89230be683c372f52aea.tar.gz |
boost: Add upstream patch to fix build on depending projects
KDE's krita failed with:
| error: 'typedef void boost::static_visitor<void>::result_type' is inaccessible within this context
Note that only boost 0.173 is affected. 0.172 (dunfell) does not have this
problem and the patch will be included in upcoming 0.174.
(From OE-Core rev: a8e5bce0ec329e9fc4b0839e48f2dc3dfec1814d)
Signed-off-by: Andreas Müller <schnitzeltony@gmail.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/0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch | 30 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.73.0.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost/0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch b/meta/recipes-support/boost/boost/0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch new file mode 100644 index 0000000000..1edad329ca --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Wakely <boost@kayari.org> | ||
3 | Date: Fri, 5 Jun 2020 19:29:27 +0100 | ||
4 | Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public | ||
5 | |||
6 | Fixes #721 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/boostorg/geometry/commit/aafbceccc76dccb75963dd4f596fd1f10ee34b03] | ||
9 | |||
10 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
11 | --- | ||
12 | boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/boost/geometry/index/detail/rtree/visitors/insert.hpp b/boost/geometry/index/detail/rtree/visitors/insert.hpp | ||
16 | index 2d324cb7f..5709a930c 100644 | ||
17 | --- a/boost/geometry/index/detail/rtree/visitors/insert.hpp | ||
18 | +++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp | ||
19 | @@ -265,7 +265,7 @@ struct insert_traverse_data | ||
20 | // Default insert visitor | ||
21 | template <typename Element, typename MembersHolder> | ||
22 | class insert | ||
23 | - : MembersHolder::visitor | ||
24 | + : public MembersHolder::visitor | ||
25 | { | ||
26 | protected: | ||
27 | typedef typename MembersHolder::box_type box_type; | ||
28 | -- | ||
29 | 2.26.2 | ||
30 | |||
diff --git a/meta/recipes-support/boost/boost_1.73.0.bb b/meta/recipes-support/boost/boost_1.73.0.bb index 5e9e0d87d7..995c14e8cc 100644 --- a/meta/recipes-support/boost/boost_1.73.0.bb +++ b/meta/recipes-support/boost/boost_1.73.0.bb | |||
@@ -7,4 +7,5 @@ SRC_URI += "file://arm-intrinsics.patch \ | |||
7 | file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ | 7 | file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ |
8 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | 8 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ |
9 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | 9 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ |
10 | file://0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch \ | ||
10 | " | 11 | " |