diff options
| author | Larry-Hu <v-daih@microsoft.com> | 2018-07-02 22:55:57 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-07-03 15:12:45 -0700 |
| commit | a300dfcc3a55aff2a321a0157231cc230c06c23f (patch) | |
| tree | bed9508ac155e8d90fcda907be91c18e9582db33 | |
| parent | 4ebdbe7e88ad93423e9d0d75eb066ecf8ab5fcad (diff) | |
| download | vcpkg-a300dfcc3a55aff2a321a0157231cc230c06c23f.tar.gz vcpkg-a300dfcc3a55aff2a321a0157231cc230c06c23f.zip | |
Remove patch and update tp latest folly release v2018.07.02.00
| -rw-r--r-- | ports/folly/fixC2338.patch | 13 | ||||
| -rw-r--r-- | ports/folly/portfile.cmake | 5 |
2 files changed, 2 insertions, 16 deletions
diff --git a/ports/folly/fixC2338.patch b/ports/folly/fixC2338.patch deleted file mode 100644 index 2a40e4f89..000000000 --- a/ports/folly/fixC2338.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
-index 0b97bfd..e442c73 100644
---- a/CMake/FollyCompilerMSVC.cmake
-+++ b/CMake/FollyCompilerMSVC.cmake
-@@ -268,7 +268,7 @@ function(apply_folly_compile_options_to_target THETARGET)
- _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions.
- _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
- _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
--
-+ _DISABLE_EXTENDED_ALIGNED_STORAGE
- _STL_EXTRA_DISABLED_WARNINGS=4774\ 4987
-
- $<$<BOOL:${MSVC_ENABLE_CPP_LATEST}>:_HAS_AUTO_PTR_ETC=1> # We're building in C++ 17 or greater mode, but certain dependencies (Boost) still have dependencies on unary_function and binary_function, so we have to make sure not to remove them.
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 52bd5764a..019bbb087 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,12 +17,11 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.06.25.00 - SHA512 4961c02326005bcd82200f9e1b0b3d00c9afb60ed6dacdcc4f191095670122ea2fe33e91b3d638dc55664636af7c1b4f75b5f5c0c5cdfb0e8ca310ab28aa5ca3 + REF v2018.07.02.00 + SHA512 dcec94b3ab47deef124797bb2616544e4fba8b62ee8886d3b2c604534dafcca810ecf111b86032db15a9a77c89aa0139be047e2761e8df0d067dd72a584dcc13 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/find-gflags.patch - ${CMAKE_CURRENT_LIST_DIR}/fixC2338.patch ) file(COPY |