diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-06-25 18:25:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 18:25:27 -0700 |
| commit | 1ab58d7315a0239366a7643aef4e1edd390990ba (patch) | |
| tree | 0a58744c7f23e46b74ec10e4b3f25ba3c6deee62 | |
| parent | 7d72108b9a09e92342ff695c074766fb068049df (diff) | |
| parent | 331c1ea8fe4f217021173ad730e08e00c030b05f (diff) | |
| download | vcpkg-1ab58d7315a0239366a7643aef4e1edd390990ba.tar.gz vcpkg-1ab58d7315a0239366a7643aef4e1edd390990ba.zip | |
Merge pull request #3730 from LarryIII/FixFolly
Add option -D_DISABLE_EXTENDED_ALIGNED to disable error C2338 in Folly
| -rw-r--r-- | ports/folly/CONTROL | 2 | ||||
| -rw-r--r-- | ports/folly/fixC2338.patch | 13 | ||||
| -rw-r--r-- | ports/folly/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index 658468f55..a14726b6f 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.05.14.00 +Version: 2018.05.14.00-01 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/fixC2338.patch b/ports/folly/fixC2338.patch new file mode 100644 index 000000000..2a40e4f89 --- /dev/null +++ b/ports/folly/fixC2338.patch @@ -0,0 +1,13 @@ +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 9dce4f14e..e0cad5ac6 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_github( HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/find-gflags.patch + ${CMAKE_CURRENT_LIST_DIR}/fixC2338.patch ) file(COPY |