aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Moore <crmoore@users.noreply.github.com>2020-04-27 10:27:51 -0400
committerGitHub <noreply@github.com>2020-04-27 07:27:51 -0700
commit2bf1c1da02694101364f5b6d029cdd3e4f42102e (patch)
tree2ab05e121d5bb3557667d75638d7f06d500ed17b
parentd525bf5b203e3595d5396f24adc2ea0aff70190a (diff)
downloadvcpkg-2bf1c1da02694101364f5b6d029cdd3e4f42102e.tar.gz
vcpkg-2bf1c1da02694101364f5b6d029cdd3e4f42102e.zip
[boost-coroutine] Add patch from boost.org (#10988)
* [boost-coroutine] Add patch from boost.org * [boost-coroutine] update package version and remove derecated include
-rw-r--r--ports/boost-coroutine/0001-revert-cease-dependence-on-range.patch49
-rw-r--r--ports/boost-coroutine/CONTROL2
-rw-r--r--ports/boost-coroutine/portfile.cmake4
3 files changed, 52 insertions, 3 deletions
diff --git a/ports/boost-coroutine/0001-revert-cease-dependence-on-range.patch b/ports/boost-coroutine/0001-revert-cease-dependence-on-range.patch
new file mode 100644
index 000000000..4e67c1827
--- /dev/null
+++ b/ports/boost-coroutine/0001-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/include/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
+index ea96981..640896f 100644
+--- a/include/boost/coroutine/asymmetric_coroutine.hpp
++++ b/include/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
+
diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL
index ef712c32a..c1ff1dc72 100644
--- a/ports/boost-coroutine/CONTROL
+++ b/ports/boost-coroutine/CONTROL
@@ -1,6 +1,6 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-coroutine
-Version: 1.72.0
+Version: 1.72.0-1
Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp), boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-system, boost-thread, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/coroutine
Description: Boost coroutine module
diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake
index 2572446b1..fe6171593 100644
--- a/ports/boost-coroutine/portfile.cmake
+++ b/ports/boost-coroutine/portfile.cmake
@@ -1,13 +1,13 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/coroutine
REF boost-1.72.0
SHA512 efd234d24692a484b3bb4fdf9790d6e0014ba87ba628768dc2710c9999da14ea4ec6fef2e55a6283d8c3cb22894bd737cadb61f788d9f5e1408785e8c32892a0
HEAD_REF master
+ PATCHES
+ 0001-revert-cease-dependence-on-range.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)