diff options
| author | Bazaah | 2024-09-06 22:59:15 +0000 |
|---|---|---|
| committer | Bazaah | 2024-09-07 17:20:56 +0000 |
| commit | 8c5cc7d8deec002f7596b6d0860859a0a718f12b (patch) | |
| tree | 53d8f48c94797f480e81f56a82fa74a256d4b9ee | |
| parent | 3c3f9dd124f20b424ff46db8f8fe8f8332067bd8 (diff) | |
| download | aur-8c5cc7d8deec002f7596b6d0860859a0a718f12b.tar.gz | |
repo: add boost-1.86-fixes.patch
Fixes three issues found during rebuild:
1. Change to boost::uuids::uuid preventing *char cast
2. Missed header for boost::mt11213b
Seemingly an actual bug on ceph, this header should have been
included as far back as 1.60 but I guess was transitively included
from somewhere, and now isn't
3. undef BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS before including
<boost/python/*> headers
Apparently, you win free debugging of boost metaprogramming during
preprocessor macro expansion if you do this; who knew?
The maintainers of boost python. Because of the open 2 year old bug
report. (:
References: https://github.com/boostorg/python/issues/394
References: https://www.boost.org/doc/libs/1_86_0/libs/uuid/doc/html/uuid.html#changes_changes_in_boost_1_86_0_major_update
References: https://www.boost.org/doc/libs/1_86_0/doc/html/doxygen/headers/mersenne__twister_8hpp_1a29ac4e21d84adda27beb1803a0525ca5.html
| -rw-r--r-- | ceph-18.2.4-boost-1.86-fixes.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/ceph-18.2.4-boost-1.86-fixes.patch b/ceph-18.2.4-boost-1.86-fixes.patch new file mode 100644 index 000000000000..5791dbfaf922 --- /dev/null +++ b/ceph-18.2.4-boost-1.86-fixes.patch @@ -0,0 +1,66 @@ +diff --git a/src/include/uuid.h b/src/include/uuid.h +index f6ef9878dae..352af8a2034 100644 +--- a/src/include/uuid.h ++++ b/src/include/uuid.h +@@ -60,7 +60,7 @@ struct uuid_d { + } + + const char *bytes() const { +- return (const char*)uuid.data; ++ return (const char*)uuid.data(); + } + + void encode(::ceph::buffer::list::contiguous_appender& p) const { +diff --git a/src/mgr/PyModule.cc b/src/mgr/PyModule.cc +index 084cf3ffc1e..010a1177a88 100644 +--- a/src/mgr/PyModule.cc ++++ b/src/mgr/PyModule.cc +@@ -36,6 +36,11 @@ std::string PyModule::mgr_store_prefix = "mgr/"; + + // Courtesy of http://stackoverflow.com/questions/1418015/how-to-get-python-exception-text + #define BOOST_BIND_GLOBAL_PLACEHOLDERS ++// 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 ++#undef BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS + // Boost apparently can't be bothered to fix its own usage of its own + // deprecated features. + #include <boost/python/extract.hpp> +diff --git a/src/test/objectstore/Allocator_aging_fragmentation.cc b/src/test/objectstore/Allocator_aging_fragmentation.cc +index 220f8841b8e..6ddfb02b1dd 100755 +--- a/src/test/objectstore/Allocator_aging_fragmentation.cc ++++ b/src/test/objectstore/Allocator_aging_fragmentation.cc +@@ -19,6 +19,7 @@ + #include "os/bluestore/Allocator.h" + + #include <boost/random/uniform_int.hpp> ++#include <boost/random/mersenne_twister.hpp> + + typedef boost::mt11213b gen_type; + +diff --git a/src/test/objectstore/Allocator_bench.cc b/src/test/objectstore/Allocator_bench.cc +index 0d04a854e9a..5218207d2c2 100644 +--- a/src/test/objectstore/Allocator_bench.cc ++++ b/src/test/objectstore/Allocator_bench.cc +@@ -15,6 +15,7 @@ + #include "os/bluestore/Allocator.h" + + #include <boost/random/uniform_int.hpp> ++#include <boost/random/mersenne_twister.hpp> + typedef boost::mt11213b gen_type; + + #include "common/debug.h" +diff --git a/src/test/objectstore/Allocator_test.cc b/src/test/objectstore/Allocator_test.cc +index b006500153c..0edea1d4ac1 100644 +--- a/src/test/objectstore/Allocator_test.cc ++++ b/src/test/objectstore/Allocator_test.cc +@@ -14,6 +14,8 @@ + #include "include/Context.h" + #include "os/bluestore/Allocator.h" + ++#include <boost/random/mersenne_twister.hpp> ++ + using namespace std; + + typedef boost::mt11213b gen_type; |