diff options
author | Andrew Geissler <geissonator@gmail.com> | 2020-04-21 19:19:11 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-26 14:00:49 +0100 |
commit | ae1be0d1d1cdc48c4b7c6328e02f0c12d5252fd9 (patch) | |
tree | 9da723a81df5fff3b3aa960de9607cf22462f577 /meta | |
parent | f9e11276432f1903047f483a68ca4b5a0d6c6111 (diff) | |
download | poky-ae1be0d1d1cdc48c4b7c6328e02f0c12d5252fd9.tar.gz |
boost: revert 1.72.0 regression
https://www.boost.org/users/history/version_1_72_0.html documents a
"Known Issue" and has a revert patch for an issue that causes code to
fail to compile that includes the coroutine function. Without this
patch, code which includes the asymmetric_coroutine.hpp will fail to
compile.
(From OE-Core rev: e25e3f151c324272990ad6370c5bc71fd5d05c8c)
Signed-off-by: Andrew Geissler <geissonator@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/boost/boost_1.72.0.bb | 1 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch | 53 |
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost_1.72.0.bb b/meta/recipes-support/boost/boost_1.72.0.bb index 5e9e0d87d7..0b7badbc76 100644 --- a/meta/recipes-support/boost/boost_1.72.0.bb +++ b/meta/recipes-support/boost/boost_1.72.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-revert-cease-dependence-on-range.patch \ | ||
10 | " | 11 | " |
diff --git a/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch b/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch new file mode 100644 index 0000000000..d6d09a23a5 --- /dev/null +++ b/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 | ||
2 | From: Oliver Kowalke <oliver.kowalke@gmail.com> | ||
3 | Date: Sun, 1 Dec 2019 20:40:28 +0100 | ||
4 | Subject: [PATCH] Revert "Cease dependence on Range" | ||
5 | |||
6 | This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. | ||
7 | |||
8 | see #44 (One test fails to compile after boostorg/coroutine submodule updated) | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/boostorg/coroutine/commit/9c73b2f7c1759a9508ba8780b38dc15f07f1a447] | ||
11 | |||
12 | Signed-off-by: Andrew Geissler <geissonator@gmail.com> | ||
13 | --- | ||
14 | boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- | ||
15 | 1 file changed, 3 insertions(+), 9 deletions(-) | ||
16 | |||
17 | diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp | ||
18 | index ea96981..640896f 100644 | ||
19 | --- a/boost/coroutine/asymmetric_coroutine.hpp | ||
20 | +++ b/boost/coroutine/asymmetric_coroutine.hpp | ||
21 | @@ -14,6 +14,7 @@ | ||
22 | #include <boost/assert.hpp> | ||
23 | #include <boost/config.hpp> | ||
24 | #include <boost/move/move.hpp> | ||
25 | +#include <boost/range.hpp> | ||
26 | #include <boost/throw_exception.hpp> | ||
27 | #include <boost/utility/explicit_operator_bool.hpp> | ||
28 | |||
29 | @@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) | ||
30 | |||
31 | } | ||
32 | |||
33 | -// forward declaration of Boost.Range traits to break dependency on it | ||
34 | -template<typename C, typename Enabler> | ||
35 | -struct range_mutable_iterator; | ||
36 | - | ||
37 | -template<typename C, typename Enabler> | ||
38 | -struct range_const_iterator; | ||
39 | - | ||
40 | template< typename Arg > | ||
41 | -struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > | ||
42 | +struct range_mutable_iterator< coroutines::push_coroutine< Arg > > | ||
43 | { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; | ||
44 | |||
45 | template< typename R > | ||
46 | -struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > | ||
47 | +struct range_mutable_iterator< coroutines::pull_coroutine< R > > | ||
48 | { typedef typename coroutines::pull_coroutine< R >::iterator type; }; | ||
49 | |||
50 | } | ||
51 | -- | ||
52 | 2.24.1 | ||
53 | |||