diff options
| author | pravic <ehysta@gmail.com> | 2017-04-21 14:10:26 +0300 |
|---|---|---|
| committer | pravic <ehysta@gmail.com> | 2017-04-21 14:10:26 +0300 |
| commit | e373bc98fed9050f244d56dabfca758861b1c9e3 (patch) | |
| tree | 45a9cf6086f7d4b87b22759ae61eadd433573666 | |
| parent | 4d850d153a2253fa54308b2f9128b07f2db9428a (diff) | |
| download | vcpkg-e373bc98fed9050f244d56dabfca758861b1c9e3.tar.gz vcpkg-e373bc98fed9050f244d56dabfca758861b1c9e3.zip | |
Revert TLS patch since it has been fixed in 1.64
| -rw-r--r-- | ports/boost/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost/portfile.cmake | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index feea11bf8..23809da56 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,4 +1,4 @@ Source: boost -Version: 1.64 +Version: 1.64-1 Description: Peer-reviewed portable C++ source libraries Build-Depends: zlib, bzip2 diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 7bbd12cd1..5317b0850 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -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 ###################### |