diff options
| author | Adam Emerson <aemerson@redhat.com> | 2025-01-07 03:01:49 +0100 |
|---|---|---|
| committer | Adam Emerson <aemerson@redhat.com> | 2025-01-12 18:01:35 +0100 |
| commit | d44b2227cdc6d1e2ad4b242473f6c392419d6fbf (patch) | |
| tree | 42c906973ff2c4101460a88ac117277fc6740c99 | |
| parent | Merge pull request #61164 from chardan/wip-objectstore-ops-replayer-sign-warning (diff) | |
| download | ceph-d44b2227cdc6d1e2ad4b242473f6c392419d6fbf.tar.xz ceph-d44b2227cdc6d1e2ad4b242473f6c392419d6fbf.zip | |
mgr: Work around bug in Boost MPI/Python
Thanks to the maintainers of the Arch User Repository Ceph PKGBUILD
for this fix.
Signed-off-by: Adam Emerson <aemerson@redhat.com>
| -rw-r--r-- | src/mgr/PyModule.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/mgr/PyModule.cc b/src/mgr/PyModule.cc index cff63ef4a6b..4f996489ba0 100644 --- a/src/mgr/PyModule.cc +++ b/src/mgr/PyModule.cc @@ -38,6 +38,18 @@ std::string PyModule::mgr_store_prefix = "mgr/"; #define BOOST_BIND_GLOBAL_PLACEHOLDERS // Boost apparently can't be bothered to fix its own usage of its own // deprecated features. + +// Fix instances of "'BOOST_PP_ITERATION_02' was not declared in this scope; did +// you mean 'BOOST_PP_ITERATION_05'" and related macro error bullshit that spans +// 300 lines of errors +// +// Apparently you can't include boost/python stuff _and_ have this header +// defined +// +// Thanks to the ceph-aur folks for the fix at: +// https://github.com/bazaah/aur-ceph/commit/8c5cc7d8deec002f7596b6d0860859a0a718f12b +#undef BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS + #include <boost/python/extract.hpp> #include <boost/python/import.hpp> #include <boost/python/object.hpp> |