aboutsummaryrefslogtreecommitdiff
path: root/ports/libtorrent
diff options
context:
space:
mode:
authoryurybura <yurybura@gmail.com>2020-01-17 02:10:15 +0300
committerVictor Romero <romerosanchezv@gmail.com>2020-01-16 15:10:15 -0800
commitc50852aba0aa8df22e17133352edb432a9fc1e56 (patch)
treedaaa75ba0aed1f1650a3c3645e5776e64cf6cdc0 /ports/libtorrent
parente3dfd4a9fa25c05abcf166a1b3bb260b542ed598 (diff)
downloadvcpkg-c50852aba0aa8df22e17133352edb432a9fc1e56.tar.gz
vcpkg-c50852aba0aa8df22e17133352edb432a9fc1e56.zip
[boost] Update to 1.72.0 (#9317)
* [boost-python] Support Python2 as feature, fix build with installed Python2 * [boost-python] Update generate script to support Python2 mod * Re-generate boost ports * [boost-modular-build-helper] Update to 1.71. [boost-build] Update to 1.71. * [boost-modular-build-helper] Remove manual library name changing [boost-iostreams] Use boost-modular-headers.cmake script * Delete temporary file. * Revert changes in modular build script. * Update ports versions. * [boost-modular-build-helper] Fix build boost-iostreams with LZMA and ZSTD * [boost] Update to 1.72.0 * [libtorrent] Fix build with Boost 1.72.0 Original PR: https://github.com/arvidn/libtorrent/pull/4091 * Update ci.baseline.txt: - fail libgo:* due to use the removed class from Boost.Context 1.72.0 (reported issue https://github.com/yyzybb537/libgo/issues/214) - pass boost-context:arm64-windows - fix typo * Folly only supports the x64 architecture * fail boost-coroutine:arm64-windows=fail and boost-fiber:arm64-windows=fail because they use fcontext_t from Boost.Context which is not implemented for Windows on ARM64 (reported issue https://github.com/boostorg/context/issues/130) * Fix globbing-expressions * Add vcpkg_buildpath_length_warning(37) for boost-system. Revert boost-iostreams port changes. * Update ci.baseline.txt
Diffstat (limited to 'ports/libtorrent')
-rw-r--r--ports/libtorrent/add-executor_type.patch14
-rw-r--r--ports/libtorrent/portfile.cmake1
2 files changed, 15 insertions, 0 deletions
diff --git a/ports/libtorrent/add-executor_type.patch b/ports/libtorrent/add-executor_type.patch
new file mode 100644
index 000000000..2d2a36c49
--- /dev/null
+++ b/ports/libtorrent/add-executor_type.patch
@@ -0,0 +1,14 @@
+diff --git a/include/libtorrent/aux_/socket_type.hpp b/include/libtorrent/aux_/socket_type.hpp
+index 1342d39ad..364ec1e8f 100644
+--- a/include/libtorrent/aux_/socket_type.hpp
++++ b/include/libtorrent/aux_/socket_type.hpp
+@@ -184,6 +184,9 @@ namespace aux {
+ using receive_buffer_size = tcp::socket::receive_buffer_size;
+ using send_buffer_size = tcp::socket::send_buffer_size;
+
++#if BOOST_VERSION >= 106600
++ using executor_type = tcp::socket::executor_type;
++#endif
+ explicit socket_type(io_service& ios): m_io_service(ios), m_type(0) {}
+ ~socket_type();
+
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index 752a8f217..3dbf7750e 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
add-datetime-to-boost-libs.patch
+ add-executor_type.patch
)
vcpkg_configure_cmake(