ceph: backport patch to fix compilation failure of boost 1.72
PATCH 1/1 ceph: backport patch to fix compilation failure of boost 1.72
Backport a patch to fix compliation failure caused by boost upgrading to 1.72.
Signed-off-by Chen Qi <[email protected]>
--- ...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
recipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch new file +62 -0
@@ -0,0 +1,62 @@ +From ea64c4909ffeae10e5d8e0a23604030e8849f803 Mon Sep 17 00:00:00 2001 +From: Kefu Chai <[email protected]> +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 <[email protected]> + +Upstream-Status: Backport [https://github.com/ceph/ceph/commit/ea64c4909ffeae10e5d8e0a23604030e8849f803] + +Signed-off-by: Chen Qi <[email protected]> +--- + 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 +
recipes-extended/ceph/ceph_14.2.3.bb +1 -0
@@ -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"
Signature · 1 line
2.17.1
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
Quoted 95 lines · 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 <[email protected]>--- ...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.patchrecipes-extended/ceph/ceph/0001-common-rgw-workaround-for-boost-1.72.patch new file +62
-0@@ -0,0 +1,62 @@ +From ea64c4909ffeae10e5d8e0a23604030e8849f803 Mon Sep 17 00:00:00 2001 +From: Kefu Chai <[email protected]> +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 <[email protected]> + +Upstream-Status: Backport [https://github.com/ceph/ceph/commit/ea64c4909ffeae10e5d8e0a23604030e8849f803] + +Signed-off-by: Chen Qi <[email protected]> +--- + 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 +recipes-extended/ceph/ceph_14.2.3.bb +1
-0@@ -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"Signature · 1 line
2.17.1