diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-11-22 09:47:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 09:47:40 -0800 |
| commit | 45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch) | |
| tree | f874a8c4a7392309bdbb86447288597ec0a4a281 /ports/boost-thread | |
| parent | 62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff) | |
| parent | 8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff) | |
| download | vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip | |
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/boost-thread')
| -rw-r--r-- | ports/boost-thread/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-thread/avoid-winapi.patch | 13 | ||||
| -rw-r--r-- | ports/boost-thread/portfile.cmake | 5 |
3 files changed, 3 insertions, 17 deletions
diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL index e38b6f31a..d65ce4a71 100644 --- a/ports/boost-thread/CONTROL +++ b/ports/boost-thread/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-thread
-Version: 1.70.0-1
+Version: 1.71.0
Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
Homepage: https://github.com/boostorg/thread
Description: Boost thread module
diff --git a/ports/boost-thread/avoid-winapi.patch b/ports/boost-thread/avoid-winapi.patch deleted file mode 100644 index 2308600ea..000000000 --- a/ports/boost-thread/avoid-winapi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp -index e075140..d60ab36 100644 ---- a/include/boost/thread/win32/thread_primitives.hpp -+++ b/include/boost/thread/win32/thread_primitives.hpp -@@ -70,7 +70,7 @@ namespace boost - { - namespace win32 - { -- namespace detail { typedef ticks_type (BOOST_WINAPI_WINAPI_CC *gettickcount64_t)(); } -+ namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); } - extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64; - - enum event_type diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index f17812eb3..32076be1c 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -5,10 +5,9 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/thread
- REF boost-1.70.0
- SHA512 2c29fc8f1ff805f126f162865c8bad51f8aa56942d54999fe0191bcf4bf8f472c070d7977e731ceb6d46ff9d0e6d39013a3df79bfe8f4ed4631906cd26c8537a
+ REF boost-1.71.0
+ SHA512 0f0de2823f2fb2c5a44824555223dbd8e1cf6072b918ebd959c0b51547ffe7db6dcf5d675d7d229406eaf1bccfe7d3041318932d4020b33bbd4da722f9aa4cce
HEAD_REF master
- PATCHES avoid-winapi.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
|