[folly] Update to version 2017.11.27.00

6 files changed, 3 insertions, 156 deletions

diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 027979146..7a239386a 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,4 +1,4 @@
 Source: folly
-Version: 2017.10.02.00
+Version: 2017.11.27.00
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: zlib, openssl, boost, libevent, double-conversion, glog, gflags, lz4, liblzma, snappy
diff --git a/ports/folly/fix-MSG_ERRQUEUE.diff b/ports/folly/fix-MSG_ERRQUEUE.diff
deleted file mode 100644
index ee3a1215a..000000000
--- a/ports/folly/fix-MSG_ERRQUEUE.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/folly/io/async/AsyncSocket.cpp b/folly/io/async/AsyncSocket.cpp
-index 7f8c5f13..f77adbc0 100644
---- a/folly/io/async/AsyncSocket.cpp
-+++ b/folly/io/async/AsyncSocket.cpp
-@@ -41,7 +41,7 @@ namespace fsp = folly::portability::sockets;
- namespace folly {
- 
- static constexpr bool msgErrQueueSupported =
--#ifdef MSG_ERRQUEUE
-+#if defined(MSG_ERRQUEUE) && !defined(_WIN32)
-     true;
- #else
-     false;
-@@ -1551,7 +1551,7 @@ void AsyncSocket::handleErrMessages() noexcept {
-     return;
-   }
- 
--#ifdef MSG_ERRQUEUE
-+#if defined(MSG_ERRQUEUE) && !defined(_WIN32)
-   uint8_t ctrl[1024];
-   unsigned char data;
-   struct msghdr msg;
diff --git a/ports/folly/fix-histogram.diff b/ports/folly/fix-histogram.diff
deleted file mode 100644
index ca92a891e..000000000
--- a/ports/folly/fix-histogram.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/folly/stats/Histogram.h
-+++ b/folly/stats/Histogram.h
-@@ -485,7 +485,7 @@
- // with /permissive- (the default for the CMake build), so we directly include
- // the -defs as if it were -inl, and don't provide the explicit instantiations.
- // https://developercommunity.visualstudio.com/content/problem/81223/incorrect-error-c5037-with-permissive.html
--#if defined(_MSC_VER) && _MSC_FULL_VER >= 191125506 && _MSC_FULL_VER < 191125542
-+#if defined(_MSC_VER) && _MSC_FULL_VER >= 191125506 && _MSC_FULL_VER <= 191125547
- #define FOLLY_MSVC_USE_WORKAROUND_FOR_C5037 1
- #else
- #define FOLLY_MSVC_USE_WORKAROUND_FOR_C5037 0
diff --git a/ports/folly/fix-malloc.diff b/ports/folly/fix-malloc.diff
deleted file mode 100644
index db7a23063..000000000
--- a/ports/folly/fix-malloc.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/folly/Malloc.h	Mon Oct 09 04:35:09 2017
-+++ b/folly/Malloc.h	Fri Oct 13 15:31:36 2017
-@@ -189,9 +189,6 @@
-       return false;
-     }
- 
--    /* Avoid optimizing away the malloc.  */
--    asm volatile("" ::"m"(ptr) : "memory");
--
-     return (origAllocated != *counter);
-   }();
- 
diff --git a/ports/folly/fix-static-linking.diff b/ports/folly/fix-static-linking.diff
deleted file mode 100644
index 80434faca..000000000
--- a/ports/folly/fix-static-linking.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index 211c6fbf..fbcbddf0 100755
---- a/CMake/folly-deps.cmake
-+++ b/CMake/folly-deps.cmake
-@@ -10,9 +10,26 @@ find_package(Boost 1.55.0 MODULE
-     thread
-   REQUIRED
- )
-+
- find_package(DoubleConversion MODULE REQUIRED)
--find_package(GFlags MODULE REQUIRED)
--find_package(GLog MODULE REQUIRED)
--find_package(LibEvent MODULE REQUIRED)
-+
-+find_package(gflags CONFIG)
-+if(NOT TARGET gflags)
-+  message(STATUS "MODULE: GFlags")
-+  find_package(GFlags MODULE REQUIRED)
-+endif()
-+
-+find_package(glog CONFIG)
-+if(NOT TARGET glog::glog)
-+  message(STATUS "MODULE: GLog")
-+  find_package(GLog MODULE REQUIRED)
-+endif()
-+
-+find_package(Libevent CONFIG)
-+if(NOT TARGET event)
-+  message(STATUS "MODULE: Libevent")
-+  find_package(LibEvent MODULE REQUIRED)
-+endif()
-+
- find_package(OpenSSL MODULE REQUIRED)
- find_package(PThread MODULE)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cdc992a8..c0231402 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,9 +141,38 @@ set(FOLLY_SHINY_DEPENDENCIES
- 
- set(FOLLY_LINK_LIBRARIES
-   ${DOUBLE_CONVERSION_LIBRARY}
--  ${LIBEVENT_LIB}
--  ${LIBGFLAGS_LIBRARY}
--  ${LIBGLOG_LIBRARY}
-+)
-+
-+set(FOLLY_INCLUDE_DIRECTORIES
-+  ${DOUBLE_CONVERSION_INCLUDE_DIR}
-+)
-+
-+if(TARGET gflags_static)
-+  set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} gflags_static)
-+elseif(TARGET gflags)
-+  set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} gflags)
-+else()
-+  set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBGFLAGS_LIBRARY})
-+  set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBGFLAGS_INCLUDE_DIR})
-+endif()
-+
-+if(TARGET glog::glog)
-+  set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} glog::glog)
-+else()
-+  set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBGLOG_LIBRARY})
-+  set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBGLOG_INCLUDE_DIR})
-+endif()
-+
-+if(TARGET event)
-+  set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} event)
-+else()
-+  set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBEVENT_LIB})
-+  set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBEVENT_INCLUDE_DIR})
-+endif()
-+
-+
-+set(FOLLY_LINK_LIBRARIES
-+  ${FOLLY_LINK_LIBRARIES}
-   Iphlpapi.lib
-   Ws2_32.lib
- 
-@@ -152,15 +181,12 @@ set(FOLLY_LINK_LIBRARIES
- 
- target_include_directories(folly_base
-   PUBLIC
--    ${DOUBLE_CONVERSION_INCLUDE_DIR}
--    ${LIBGFLAGS_INCLUDE_DIR}
--    ${LIBGLOG_INCLUDE_DIR}
--    ${LIBEVENT_INCLUDE_DIR}
--    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-+    ${FOLLY_INCLUDE_DIRECTORIES}
- )
- 
- foreach (LIB ${FOLLY_SHINY_DEPENDENCIES})
-   target_include_directories(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INCLUDE_DIRECTORIES>)
-+  target_compile_definitions(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INTERFACE_COMPILE_DEFINITIONS>)
- endforeach()
- 
- if (FOLLY_HAVE_PTHREAD)
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 8a48ee85d..fc3584860 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -17,21 +17,11 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF v2017.10.02.00
-    SHA512 4fc7840c7a6c528c8ba6a21817bc75f15f5cd5f781d104a1f0622fe1085a6cb26ff9749616b164afff0ea46be6d16877457a98f417e6dbe1044db7605650a6d3
+    REF v2017.11.27.00
+    SHA512 738bb00047a7cbd807f2dccd64031763df80bbebca73f1ae9500b750dcad156dde84e47f4eda7af1bcd7abfae10c973da47515f2e111929979d1637869cf06ee
     HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH
-        ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-static-linking.diff
-        ${CMAKE_CURRENT_LIST_DIR}/fix-malloc.diff
-        ${CMAKE_CURRENT_LIST_DIR}/fix-MSG_ERRQUEUE.diff
-        ${CMAKE_CURRENT_LIST_DIR}/fix-histogram.diff
-)
-
 if(VCPKG_CRT_LINKAGE STREQUAL static)
     set(MSVC_USE_STATIC_RUNTIME ON)
 else()