| 1 |
commit: 51a79e39c1005fe618fe146872a931ce4ae2035c |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 29 13:06:01 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 29 13:06:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a79e39 |
| 7 |
|
| 8 |
dev-libs/boost: Include patch for net-analyzer/icinga2 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/704128 |
| 11 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/boost/boost-1.72.0.ebuild | 2 + |
| 15 |
...t-1.72.0-revert-cease-dependence-on-range.patch | 49 ++++++++++++++++++++++ |
| 16 |
2 files changed, 51 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-libs/boost/boost-1.72.0.ebuild b/dev-libs/boost/boost-1.72.0.ebuild |
| 19 |
index 3417b408e43..b44e04ef83d 100644 |
| 20 |
--- a/dev-libs/boost/boost-1.72.0.ebuild |
| 21 |
+++ b/dev-libs/boost/boost-1.72.0.ebuild |
| 22 |
@@ -58,6 +58,8 @@ PATCHES=( |
| 23 |
"${FILESDIR}"/${PN}-1.72.0-missing-serialization-split_member-include.patch |
| 24 |
# Bug 703036, per python-impl Boost.MPI |
| 25 |
"${FILESDIR}"/${PN}-1.72.0-boost-mpi-python.patch |
| 26 |
+ # Bug 704128, missing include on Boost.Ranges |
| 27 |
+ "${FILESDIR}"/${PN}-1.72.0-revert-cease-dependence-on-range.patch |
| 28 |
) |
| 29 |
|
| 30 |
python_bindings_needed() { |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..a6002074ab9 |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch |
| 37 |
@@ -0,0 +1,49 @@ |
| 38 |
+From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 |
| 39 |
+From: Oliver Kowalke <oliver.kowalke@×××××.com> |
| 40 |
+Date: Sun, 1 Dec 2019 20:40:28 +0100 |
| 41 |
+Subject: [PATCH] Revert "Cease dependence on Range" |
| 42 |
+ |
| 43 |
+This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. |
| 44 |
+ |
| 45 |
+see #44 (One test fails to compile after boostorg/coroutine submodule updated) |
| 46 |
+--- |
| 47 |
+ boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- |
| 48 |
+ 1 file changed, 3 insertions(+), 9 deletions(-) |
| 49 |
+ |
| 50 |
+diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp |
| 51 |
+index ea96981..640896f 100644 |
| 52 |
+--- a/boost/coroutine/asymmetric_coroutine.hpp |
| 53 |
++++ b/boost/coroutine/asymmetric_coroutine.hpp |
| 54 |
+@@ -14,6 +14,7 @@ |
| 55 |
+ #include <boost/assert.hpp> |
| 56 |
+ #include <boost/config.hpp> |
| 57 |
+ #include <boost/move/move.hpp> |
| 58 |
++#include <boost/range.hpp> |
| 59 |
+ #include <boost/throw_exception.hpp> |
| 60 |
+ #include <boost/utility/explicit_operator_bool.hpp> |
| 61 |
+ |
| 62 |
+@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) |
| 63 |
+ |
| 64 |
+ } |
| 65 |
+ |
| 66 |
+-// forward declaration of Boost.Range traits to break dependency on it |
| 67 |
+-template<typename C, typename Enabler> |
| 68 |
+-struct range_mutable_iterator; |
| 69 |
+- |
| 70 |
+-template<typename C, typename Enabler> |
| 71 |
+-struct range_const_iterator; |
| 72 |
+- |
| 73 |
+ template< typename Arg > |
| 74 |
+-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > |
| 75 |
++struct range_mutable_iterator< coroutines::push_coroutine< Arg > > |
| 76 |
+ { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; |
| 77 |
+ |
| 78 |
+ template< typename R > |
| 79 |
+-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > |
| 80 |
++struct range_mutable_iterator< coroutines::pull_coroutine< R > > |
| 81 |
+ { typedef typename coroutines::pull_coroutine< R >::iterator type; }; |
| 82 |
+ |
| 83 |
+ } |
| 84 |
+-- |
| 85 |
+2.24.1 |
| 86 |
+ |
Archives