diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-21 13:01:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 13:01:19 -0700 |
| commit | 95f5627b65c064d673eddce385a11a91f8309a9e (patch) | |
| tree | 42ba095e8d077c3eea36b49fe2edf77ca2099636 | |
| parent | 8dc2699e5dc77bf04a2d3455f05a31cb6b0f7c86 (diff) | |
| parent | 3b5c7dff225dd8a057ec82e4d7e99da6ff5f483e (diff) | |
| download | vcpkg-95f5627b65c064d673eddce385a11a91f8309a9e.tar.gz vcpkg-95f5627b65c064d673eddce385a11a91f8309a9e.zip | |
Merge pull request #831 from fwosar/dev/fwosar/on_tls_callback
Apply patch to make boost::thread on_tls_callback work with VS2017
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index 3f1127ab0..aa81e94a4 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -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 diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 343e0c5b0..0d066629e 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -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( |