* [meta-virtualization][PATCH] ceph: backport patch to fix compilation failure of boost 1.72
@ 2020-01-03 3:10 Chen Qi
2020-01-08 21:21 ` Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: Chen Qi @ 2020-01-03 3:10 UTC (permalink / raw)
To: meta-virtualization
Backport a patch to fix compliation failure caused by boost upgrading
to 1.72.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
...common-rgw-workaround-for-boost-1.72.patch | 62 +++++++++++++++++++
recipes-extended/ceph/ceph_14.2.3.bb | 1 +
2 files changed, 63 insertions(+)
create mode 100644 recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch
diff --git a/recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch b/recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch
new file mode 100644
index 0000000..44bda1a
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch
@@ -0,0 +1,62 @@
+From ea64c4909ffeae10e5d8e0a23604030e8849f803 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai@redhat.com>
+Date: Mon, 23 Dec 2019 16:26:13 +0800
+Subject: [PATCH] common,rgw: workaround for boost 1.72
+
+see also https://github.com/boostorg/coroutine/issues/46
+
+will need to remove this change once we require boost >= 1.73
+
+Signed-off-by: Kefu Chai <kchai@redhat.com>
+
+Upstream-Status: Backport [https://github.com/ceph/ceph/commit/ea64c4909ffeae10e5d8e0a23604030e8849f803]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ src/common/async/yield_context.h | 2 ++
+ src/rgw/rgw_asio_frontend.cc | 2 ++
+ src/test/librados/asio.cc | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/src/common/async/yield_context.h b/src/common/async/yield_context.h
+index fda9541eb4..436192c02f 100644
+--- a/src/common/async/yield_context.h
++++ b/src/common/async/yield_context.h
+@@ -14,6 +14,8 @@
+
+ #pragma once
+
++#include <boost/range/begin.hpp>
++#include <boost/range/end.hpp>
+ #include <boost/asio/io_context.hpp>
+
+ #include "acconfig.h"
+diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
+index 7df74225f6..deab1b0c66 100644
+--- a/src/rgw/rgw_asio_frontend.cc
++++ b/src/rgw/rgw_asio_frontend.cc
+@@ -7,6 +7,8 @@
+
+ #include <boost/asio.hpp>
+ #define BOOST_COROUTINES_NO_DEPRECATION_WARNING
++#include <boost/range/begin.hpp>
++#include <boost/range/end.hpp>
+ #include <boost/asio/spawn.hpp>
+ #include <boost/intrusive/list.hpp>
+
+diff --git a/src/test/librados/asio.cc b/src/test/librados/asio.cc
+index 9c86ad420c..8fa4bab197 100644
+--- a/src/test/librados/asio.cc
++++ b/src/test/librados/asio.cc
+@@ -21,6 +21,8 @@
+
+ #ifdef HAVE_BOOST_CONTEXT
+ #define BOOST_COROUTINES_NO_DEPRECATION_WARNING
++#include <boost/range/begin.hpp>
++#include <boost/range/end.hpp>
+ #include <boost/asio/spawn.hpp>
+ #endif
+ #include <boost/asio/use_future.hpp>
+--
+2.17.1
+
diff --git a/recipes-extended/ceph/ceph_14.2.3.bb b/recipes-extended/ceph/ceph_14.2.3.bb
index 25a8ea2..b2bf220 100644
--- a/recipes-extended/ceph/ceph_14.2.3.bb
+++ b/recipes-extended/ceph/ceph_14.2.3.bb
@@ -13,6 +13,7 @@ SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \
file://ceph.conf \
file://0001-rgw-add-executor-type-for-basic_waitable_timers.patch \
file://0001-rgw-beast-handle_connection-takes-io_context.patch \
+ file://0001-common-rgw-workaround-for-boost-1.72.patch \
"
SRC_URI[md5sum] = "e4a53270fba14bf34d0b4c2a2340042e"
SRC_URI[sha256sum] = "63d0eddab80f7bcdd4e9ac86d2b36c6cc8c9e2d34f20e8e426ff1620d66748dd"
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-virtualization][PATCH] ceph: backport patch to fix compilation failure of boost 1.72
2020-01-03 3:10 [meta-virtualization][PATCH] ceph: backport patch to fix compilation failure of boost 1.72 Chen Qi
@ 2020-01-08 21:21 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2020-01-08 21:21 UTC (permalink / raw)
To: Chen Qi; +Cc: meta-virtualization
merged (we should update the version in this release cycle, but there's no
sense leaving this broken while I wait for that).
Bruce
In message: [meta-virtualization][PATCH] ceph: backport patch to fix compilation failure of boost 1.72
on 03/01/2020 Chen Qi wrote:
> Backport a patch to fix compliation failure caused by boost upgrading
> to 1.72.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> ...common-rgw-workaround-for-boost-1.72.patch | 62 +++++++++++++++++++
> recipes-extended/ceph/ceph_14.2.3.bb | 1 +
> 2 files changed, 63 insertions(+)
> create mode 100644 recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch
>
> diff --git a/recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch b/recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch
> new file mode 100644
> index 0000000..44bda1a
> --- /dev/null
> +++ b/recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch
> @@ -0,0 +1,62 @@
> +From ea64c4909ffeae10e5d8e0a23604030e8849f803 Mon Sep 17 00:00:00 2001
> +From: Kefu Chai <kchai@redhat.com>
> +Date: Mon, 23 Dec 2019 16:26:13 +0800
> +Subject: [PATCH] common,rgw: workaround for boost 1.72
> +
> +see also https://github.com/boostorg/coroutine/issues/46
> +
> +will need to remove this change once we require boost >= 1.73
> +
> +Signed-off-by: Kefu Chai <kchai@redhat.com>
> +
> +Upstream-Status: Backport [https://github.com/ceph/ceph/commit/ea64c4909ffeae10e5d8e0a23604030e8849f803]
> +
> +Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> +---
> + src/common/async/yield_context.h | 2 ++
> + src/rgw/rgw_asio_frontend.cc | 2 ++
> + src/test/librados/asio.cc | 2 ++
> + 3 files changed, 6 insertions(+)
> +
> +diff --git a/src/common/async/yield_context.h b/src/common/async/yield_context.h
> +index fda9541eb4..436192c02f 100644
> +--- a/src/common/async/yield_context.h
> ++++ b/src/common/async/yield_context.h
> +@@ -14,6 +14,8 @@
> +
> + #pragma once
> +
> ++#include <boost/range/begin.hpp>
> ++#include <boost/range/end.hpp>
> + #include <boost/asio/io_context.hpp>
> +
> + #include "acconfig.h"
> +diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
> +index 7df74225f6..deab1b0c66 100644
> +--- a/src/rgw/rgw_asio_frontend.cc
> ++++ b/src/rgw/rgw_asio_frontend.cc
> +@@ -7,6 +7,8 @@
> +
> + #include <boost/asio.hpp>
> + #define BOOST_COROUTINES_NO_DEPRECATION_WARNING
> ++#include <boost/range/begin.hpp>
> ++#include <boost/range/end.hpp>
> + #include <boost/asio/spawn.hpp>
> + #include <boost/intrusive/list.hpp>
> +
> +diff --git a/src/test/librados/asio.cc b/src/test/librados/asio.cc
> +index 9c86ad420c..8fa4bab197 100644
> +--- a/src/test/librados/asio.cc
> ++++ b/src/test/librados/asio.cc
> +@@ -21,6 +21,8 @@
> +
> + #ifdef HAVE_BOOST_CONTEXT
> + #define BOOST_COROUTINES_NO_DEPRECATION_WARNING
> ++#include <boost/range/begin.hpp>
> ++#include <boost/range/end.hpp>
> + #include <boost/asio/spawn.hpp>
> + #endif
> + #include <boost/asio/use_future.hpp>
> +--
> +2.17.1
> +
> diff --git a/recipes-extended/ceph/ceph_14.2.3.bb b/recipes-extended/ceph/ceph_14.2.3.bb
> index 25a8ea2..b2bf220 100644
> --- a/recipes-extended/ceph/ceph_14.2.3.bb
> +++ b/recipes-extended/ceph/ceph_14.2.3.bb
> @@ -13,6 +13,7 @@ SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \
> file://ceph.conf \
> file://0001-rgw-add-executor-type-for-basic_waitable_timers.patch \
> file://0001-rgw-beast-handle_connection-takes-io_context.patch \
> + file://0001-common-rgw-workaround-for-boost-1.72.patch \
> "
> SRC_URI[md5sum] = "e4a53270fba14bf34d0b4c2a2340042e"
> SRC_URI[sha256sum] = "63d0eddab80f7bcdd4e9ac86d2b36c6cc8c9e2d34f20e8e426ff1620d66748dd"
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-08 21:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-03 3:10 [meta-virtualization][PATCH] ceph: backport patch to fix compilation failure of boost 1.72 Chen Qi
2020-01-08 21:21 ` Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.