Skip to contentSkip to conversation

boost: revert 1.72.0 regression

PATCH In review Andrew Geissler 2 participants 2 messages Apr 22, 2020 – Apr 25, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 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.

v2: added Signed-off-by to patch
added Upstream-Status tag
v3: moved Upstream-status tag to the patch file

---
 meta/recipes-support/boost/boost_1.72.0.bb    |  1 +
 ...001-revert-cease-dependence-on-range.patch | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch
meta/recipes-support/boost/boost_1.72.0.bb +1 -0
index 5e9e0d87d7..0b7badbc76 100644
@@ -7,4 +7,5 @@ SRC_URI += "file://arm-intrinsics.patch \
            file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
            file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
            file://0001-dont-setup-compiler-flags-m32-m64.patch \
+           file://0001-revert-cease-dependence-on-range.patch \
            "
meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch new file +53 -0

53 lines not on this page · raw message

Signature · 1 line
2.21.0 (Apple Git-122)
#1 lore raw
Quoted 14 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Andrew Geissler
Sent: den 22 april 2020 02:19
To: [email protected]
Cc: Andrew Geissler <[email protected]>
Subject: [OE-core] [PATCH v3] 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.

Quoted 5 lines

v2: added Signed-off-by to patch
added Upstream-Status tag
v3: moved Upstream-status tag to the patch file

The v2 and v3 info above belongs below the --- line below as it relates to the review process, not the commit itself.

//Peter

Quoted 88 lines
---
 meta/recipes-support/boost/boost_1.72.0.bb    |  1 +
 ...001-revert-cease-dependence-on-range.patch | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-support/boost/files/0001-revert-cease-

dependence-on-range.patch

meta/recipes- renamed from meta/recipes-support/boost/boost_1.72.0.bb +0 -0

support/boost/boost_1.72.0.bb
index 5e9e0d87d7..0b7badbc76 100644

meta/recipes-support/boost/boost_1.72.0.bb +1 -0
@@ -7,4 +7,5 @@ SRC_URI += "file://arm-intrinsics.patch \
            file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
            file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-
 that-o.patch \
            file://0001-dont-setup-compiler-flags-m32-m64.patch \
+           file://0001-revert-cease-dependence-on-range.patch \
            "
(quoted diff) +0 -0

dependence-on-range.patch b/meta/recipes-support/boost/files/0001-revert- cease-dependence-on-range.patch
new file mode 100644
index 0000000000..d6d09a23a5

meta/recipes-support/boost/files/0001-revert-cease-dependence-on- new file +0 -0

range.patch

meta/recipes-support/boost/files/0001-revert-cease-dependence-on- new file +8 -0
@@ -0,0 +1,53 @@
+From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
+From: Oliver Kowalke <[email protected]>
+Date: Sun, 1 Dec 2019 20:40:28 +0100
+Subject: [PATCH] Revert "Cease dependence on Range"
+
+This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
+
+see #44 (One test fails to compile after boostorg/coroutine submodule

updated)

meta/recipes-support/boost/files/0001-revert-cease-dependence-on- new file +2 -0
+
+Upstream-Status: Backport

[https://github.com/boostorg/coroutine/commit/9c73b2f7c1759a9508ba8780b38
dc15f07f1a447]

meta/recipes-support/boost/files/0001-revert-cease-dependence-on- new file +7 -0
+
+Signed-off-by: Andrew Geissler <[email protected]>
+---
+ boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/boost/coroutine/asymmetric_coroutine.hpp

b/boost/coroutine/asymmetric_coroutine.hpp

meta/recipes-support/boost/files/0001-revert-cease-dependence-on- new file +24 -0
+index ea96981..640896f 100644
+--- a/boost/coroutine/asymmetric_coroutine.hpp
++++ b/boost/coroutine/asymmetric_coroutine.hpp
+@@ -14,6 +14,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/config.hpp>
+ #include <boost/move/move.hpp>
++#include <boost/range.hpp>
+ #include <boost/throw_exception.hpp>
+ #include <boost/utility/explicit_operator_bool.hpp>
+
+@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
+
+ }
+
+-// forward declaration of Boost.Range traits to break dependency on it
+-template<typename C, typename Enabler>
+-struct range_mutable_iterator;
+-
+-template<typename C, typename Enabler>
+-struct range_const_iterator;
+-
+ template< typename Arg >
+-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void
Quoted 1 line

++struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
+ { typedef typename coroutines::push_coroutine< Arg >::iterator type; };

meta/recipes-support/boost/files/0001-revert-cease-dependence-on- new file +10 -1
+
+ template< typename R >
+-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
++struct range_mutable_iterator< coroutines::pull_coroutine< R > >
+ { typedef typename coroutines::pull_coroutine< R >::iterator type; };
+
+ }
+--
+2.24.1
+
--

2.21.0 (Apple Git-122)