diff options
| author | Fabian Wosar <fw@emsisoft.com> | 2017-03-21 19:34:29 +0100 |
|---|---|---|
| committer | Fabian Wosar <fw@emsisoft.com> | 2017-03-21 19:34:29 +0100 |
| commit | 9878f153c1dbdab96f55b26f4eac61a4190cb7c7 (patch) | |
| tree | 5ace4cb9591416a75b1e9ee037eb80be88072669 | |
| parent | 38233af9a2acb332c9f8edfab62dafcb4b08ac39 (diff) | |
| download | vcpkg-9878f153c1dbdab96f55b26f4eac61a4190cb7c7.tar.gz vcpkg-9878f153c1dbdab96f55b26f4eac61a4190cb7c7.zip | |
Add boost patch to fix initialisation issues when using the VS2017 14.1 toolchain and static linking
| -rw-r--r-- | ports/boost/portfile.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 343e0c5b0..c622764ca 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -14,6 +14,14 @@ vcpkg_download_distfile(DIFF FILENAME "boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff" SHA512 77dad42bfd9bbab2bbddf361d5b7ad3dd6f812f4294c6dd1a677bb4d0191a4fff43bca32fdd4fce05d428562abb6e38afd0fd33ca6a8b5f28481d70cd2f3dd67 ) + +# apply boost TLS fix for VS2017 +vcpkg_download_distfile(DIFF + URLS "https://github.com/boostorg/thread/commit/bd0379af57fa294df310221492da618844182658.diff" + FILENAME "boost-thread-on_tls_callback-bd0379af57fa294df310221492da618844182658.diff" + SHA512 29501de9da5d101c762c9617eb74f072ec47eb9ef0021f036545bc883cbeb09c24b2ba7f78c24fb1a5d6b1fb3d7ae1def05a75be8634fc32bde0dface571c0a8 +) + FILE(READ "${DIFF}" content) STRING(REGEX REPLACE "include/" "" content "${content}") set(DIFF2 ${CURRENT_BUILDTREES_DIR}/src/boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff.fixed) |