mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 10:03:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #831 from fwosar/dev/fwosar/on_tls_callback

Browse Source 
Apply patch to make boost::thread on_tls_callback work with VS2017
This commit is contained in:
Robert Schumacher 2017-03-21 13:01:19 -07:00 committed by GitHub
commit 95f5627b65
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/boost/CONTROL
View File

@ -1,4 +1,4 @@
Source: boost
Version: 1.63-2
Version: 1.63-3
Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib, bzip2

14
ports/boost/portfile.cmake
View File

@ -14,12 +14,26 @@ vcpkg_download_distfile(DIFF
FILENAME "boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
SHA512 77dad42bfd9bbab2bbddf361d5b7ad3dd6f812f4294c6dd1a677bb4d0191a4fff43bca32fdd4fce05d428562abb6e38afd0fd33ca6a8b5f28481d70cd2f3dd67
)
# apply boost TLS fix for VS2017
vcpkg_download_distfile(TLS_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)
FILE(WRITE ${DIFF2} "${content}")
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF2})
FILE(READ "${TLS_DIFF}" content)
STRING(REGEX REPLACE "src/win32/" "libs/thread/src/win32/" content "${content}")
set(TLS_DIFF2 ${CURRENT_BUILDTREES_DIR}/src/boost-thread-on_tls_callback-bd0379af57fa294df310221492da618844182658.diff.fixed)
FILE(WRITE ${TLS_DIFF2} "${content}")
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${TLS_DIFF2})
if(NOT EXISTS ${SOURCE_PATH}/b2.exe)
message(STATUS "Bootstrapping")
vcpkg_execute_required_process(