mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-30 06:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #962 from pravic/boost-164-tls-revert

Browse Source 
Revert TLS patch since it has been fixed in 1.64
This commit is contained in:
Alexander Karatarakis 2017-04-21 13:47:57 -07:00 committed by GitHub
commit 580233a848
2 changed files with 1 additions and 14 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.64
Version: 1.64-1
Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib, bzip2

13
ports/boost/portfile.cmake
View File

@ -18,25 +18,12 @@ vcpkg_download_distfile(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})
######################
# Cleanup previous builds
######################