mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-12 02:40:31 +08:00
047670d138
Currently this is the only package keeping Boost 1.82 around; upstream install 1.85 on the development branch and have merged patches for 1.86 compatibility, so let’s unpin it and deal with pinning again if we run into compilation errors in the future. All but one patch has already been merged upstream.
21 lines
960 B
Diff
21 lines
960 B
Diff
Excerpted from <https://aur.archlinux.org/cgit/aur.git/commit/?h=ceph&id=8c5cc7d8deec002f7596b6d0860859a0a718f12b>.
|
|
|
|
Original author: Bazaah <github@luxolus.com>
|
|
|
|
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>
|