aboutsummaryrefslogtreecommitdiff
path: root/ports/folly
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-06-12 11:37:19 -0700
committerVictor Romero <romerosanchezv@gmail.com>2019-06-12 11:37:19 -0700
commit92444393148ab0bc89de6ce1cae945cee428a091 (patch)
treea443d63129d93dd729438929bce402b80f1c50c1 /ports/folly
parent874eadc574b94a05607a8408958401a524c10447 (diff)
parent59a8a9c6248ed230b19028a44484ae5f06db697d (diff)
downloadvcpkg-92444393148ab0bc89de6ce1cae945cee428a091.tar.gz
vcpkg-92444393148ab0bc89de6ce1cae945cee428a091.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into add_libraqm
Diffstat (limited to 'ports/folly')
-rw-r--r--ports/folly/CONTROL2
-rw-r--r--ports/folly/portfile.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
index 1d673877f..c466edebb 100644
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@@ -1,5 +1,5 @@
Source: folly
-Version: 2019.05.13.00
+Version: 2019.05.20.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, boost-smart-ptr
Default-Features: zlib
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index e77c084f6..7e7f40565 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -14,8 +14,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
- REF v2019.05.13.00
- SHA512 5dfeef0c2845b15e32a29119921d65e349a7ae9bcfa25c406d42d8df1614d2542153cd0ad8d0cf22592045b24272375a7839af91579d6be685cb8a3512586689
+ REF 354223ec1602913667c52cee1ce0782a82cb0cad
+ SHA512 53dd401e5fe8aebf35bec7c1b49e45a7abf152ad12f7392f31653f9e644207d0926424948ad2d7974bf3e5eabaa97e3e9113f1318883bfc99b968b3700b19023
HEAD_REF master
PATCHES
missing-include-atomic.patch