diff options
Diffstat (limited to 'dev-libs/boost/files')
3 files changed, 128 insertions, 0 deletions
diff --git a/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch new file mode 100644 index 000000000000..8fb164a6278b --- /dev/null +++ b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch @@ -0,0 +1,50 @@ +Tag Boost.MPI python impls properly to avoid name clash +https://github.com/boostorg/mpi/issues/112 + +--- a/boostcpp.jam ++++ b/boostcpp.jam +@@ -185,7 +185,7 @@ + + rule tag ( name : type ? : property-set ) + { +- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB ++ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION + { + local args = $(.format-name-args) ; + if $(layout) = versioned +@@ -223,7 +223,7 @@ + { + local result = $(name) ; + +- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB ++ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION + { + # Add Python version suffix + +--- a/libs/mpi/build/Jamfile.v2 ++++ b/libs/mpi/build/Jamfile.v2 +@@ -58,13 +58,13 @@ + rule python-tag ( name : type ? : property-set ) + { + local result = $(name) ; +- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB ++ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION + { + local version = [ $(property-set).get <python> ] ; + local lib-suffix = [ version-suffix $(version) ] ; + result = $(result)$(lib-suffix) ; + } +- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID) ++ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION && $(PYTHON_ID) + { + result = $(result)-$(PYTHON_ID) ; + } +@@ -168,6 +168,8 @@ + <link>shared:<define>BOOST_PYTHON_DYN_LINK=1 + <link>shared <runtime-link>shared + <python-debugging>on:<define>BOOST_DEBUG_PYTHON ++ -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag ++ <tag>@$(__name__).python-tag + ; + + mpi_python_libs = boost_mpi_python mpi ; diff --git a/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch b/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch new file mode 100644 index 000000000000..0c9f72583efd --- /dev/null +++ b/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch @@ -0,0 +1,29 @@ +Missing #include, as the split_member.hpp include is not +part of the nvp.hpp interface, and hence cannot be relied +upon to be included transitively. + +Confirmed on +https://github.com/boostorg/serialization/commit/c32a663c9963385430abc563f9c85f94d8da43a9#r36528430 + +Bug: https://bugs.gentoo.org/703294 + +--- a/boost/bimap/detail/map_view_iterator.hpp ++++ b/boost/bimap/detail/map_view_iterator.hpp +@@ -22,6 +22,7 @@ + + #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION + #include <boost/serialization/nvp.hpp> ++ #include <boost/serialization/split_member.hpp> + #endif // BOOST_BIMAP_DISABLE_SERIALIZATION + + #include <boost/iterator/detail/enable_if.hpp> +--- a/boost/bimap/detail/set_view_iterator.hpp ++++ b/boost/bimap/detail/set_view_iterator.hpp +@@ -22,6 +22,7 @@ + + #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION + #include <boost/serialization/nvp.hpp> ++ #include <boost/serialization/split_member.hpp> + #endif // BOOST_BIMAP_DISABLE_SERIALIZATION + + #include <boost/iterator/detail/enable_if.hpp> diff --git a/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch b/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch new file mode 100644 index 000000000000..a6002074ab93 --- /dev/null +++ b/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch @@ -0,0 +1,49 @@ +From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 +From: Oliver Kowalke <oliver.kowalke@gmail.com> +Date: Sun, 1 Dec 2019 20:40:28 +0100 +Subject: [PATCH] Revert "Cease dependence on Range" + +This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. + +see #44 (One test fails to compile after boostorg/coroutine submodule updated) +--- + boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp +index ea96981..640896f 100644 +--- a/boost/coroutine/asymmetric_coroutine.hpp ++++ b/boost/coroutine/asymmetric_coroutine.hpp +@@ -14,6 +14,7 @@ + #include <boost/assert.hpp> + #include <boost/config.hpp> + #include <boost/move/move.hpp> ++#include <boost/range.hpp> + #include <boost/throw_exception.hpp> + #include <boost/utility/explicit_operator_bool.hpp> + +@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) + + } + +-// forward declaration of Boost.Range traits to break dependency on it +-template<typename C, typename Enabler> +-struct range_mutable_iterator; +- +-template<typename C, typename Enabler> +-struct range_const_iterator; +- + template< typename Arg > +-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > ++struct range_mutable_iterator< coroutines::push_coroutine< Arg > > + { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; + + template< typename R > +-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > ++struct range_mutable_iterator< coroutines::pull_coroutine< R > > + { typedef typename coroutines::pull_coroutine< R >::iterator type; }; + + } +-- +2.24.1 + |