[folly] Upgrade

4 files changed, 18 insertions, 29 deletions

diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 865c93ce6..13f732525 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
 Source: folly
-Version: 2018.04.09.00
+Version: 2018.04.16.00
 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/find-gflags.patch b/ports/folly/find-gflags.patch
new file mode 100644
index 000000000..986dd6d57
--- /dev/null
+++ b/ports/folly/find-gflags.patch
@@ -0,0 +1,13 @@
+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake

+index 396fa6c..9d80d99 100644

+--- a/CMake/folly-deps.cmake

++++ b/CMake/folly-deps.cmake

+@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})

+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})

+ 

+ set(FOLLY_HAVE_LIBGFLAGS OFF)

+-find_package(GFlags CONFIG QUIET)

++find_package(gflags CONFIG REQUIRED)

+ if (gflags_FOUND)

+   message(STATUS "Found gflags from package config")

+   set(FOLLY_HAVE_LIBGFLAGS ON)

diff --git a/ports/folly/msvc-15.6-workaround.patch b/ports/folly/msvc-15.6-workaround.patch
deleted file mode 100644
index 6102f32ac..000000000
--- a/ports/folly/msvc-15.6-workaround.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/folly/FBString.h b/folly/FBString.h
-index 4882aac..6c83046 100644
---- a/folly/FBString.h
-+++ b/folly/FBString.h
-@@ -1890,12 +1890,14 @@ inline basic_fbstring<E, T, A, S>& basic_fbstring<E, T, A, S>::operator=(
- 
- template <typename E, class T, class A, class S>
- template <typename TP>
--inline typename std::enable_if<
--    std::is_same<
--        typename std::decay<TP>::type,
--        typename basic_fbstring<E, T, A, S>::value_type>::value,
--    basic_fbstring<E, T, A, S>&>::type
--basic_fbstring<E, T, A, S>::operator=(TP c) {
-+inline auto
-+basic_fbstring<E, T, A, S>::operator=(TP c)
-+  -> typename std::enable_if<
-+      std::is_same<
-+          typename std::decay<TP>::type,
-+          typename basic_fbstring<E, T, A, S>::value_type>::value,
-+      basic_fbstring<E, T, A, S>&>::type
-+{
-   Invariant checker(*this);
- 
-   if (empty()) {
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 520ab0539..fabfd0085 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -17,15 +17,15 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF v2018.04.09.00
-    SHA512 625034437ee6c261949652dbd6cafb50b0954b691750e4591cd0eb03cf369348cfae3b4b98c012bd906a157b7642ebcb1d8843311c74416ed51bffc5b1da3018
+    REF v2018.04.16.00
+    SHA512 1f14da6eece3a490bd134a40550c2a3f78356789090e19933b8f10bc356837ee774a21e6f0b88c45831a968587049092b9d0d77617f040ab8e177de224400408
     HEAD_REF master
 )
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/msvc-15.6-workaround.patch
+        ${CMAKE_CURRENT_LIST_DIR}/find-gflags.patch
 )
 
 file(COPY
@@ -33,6 +33,7 @@ file(COPY
     ${CMAKE_CURRENT_LIST_DIR}/FindSnappy.cmake
     DESTINATION ${SOURCE_PATH}/CMake/
 )
+file(REMOVE ${SOURCE_PATH}/CMake/FindGFlags.cmake)
 
 if(VCPKG_CRT_LINKAGE STREQUAL static)
     set(MSVC_USE_STATIC_RUNTIME ON)