Folly/2022.10.03

recipes/folly/all/conandata.yml

@@ -8,6 +8,9 @@ sources:
   "2022.01.31.00":
     url: "https://github.com/facebook/folly/archive/v2022.01.31.00.tar.gz"
     sha256: "d764b9a7832d967bb7cfea4bcda15d650315aa4d559fde1da2a52b015cd88b9c"
+  "2022.10.03.00":
+    url: "https://github.com/facebook/folly/archive/v2022.10.03.00.tar.gz"
+    sha256: "42dd54d17eed17fc0ae1c8ff35e0d11c991801d3220b0a32f82865072fe3f145"
 patches:
   "2019.10.21.00":
     - patch_file: "patches/0001-find-packages.patch"
@@ -54,3 +57,8 @@ patches:
       base_path: "source_subfolder"
     - patch_file: "patches/0022-fix-windows-minmax.patch"
       base_path: "source_subfolder"
+  "2022.10.03.00":
+    - patch_file: "patches/0017-compiler-flags.patch"
+      base_path: "source_subfolder"
+    - patch_file: "patches/0023-find-packages.patch"
+      base_path: "source_subfolder"

recipes/folly/all/conanfile.py

@@ -70,7 +70,7 @@ def requirements(self):
         self.requires("bzip2/1.0.8")
         self.requires("double-conversion/3.2.0")
         self.requires("gflags/2.2.2")
-        self.requires("glog/0.4.0")
+        self.requires("glog/0.6.0")
         self.requires("libevent/2.1.12")
         self.requires("openssl/1.1.1q")
         self.requires("lz4/1.9.3")
@@ -85,7 +85,9 @@ def requirements(self):
         if self.settings.os == "Linux":
             self.requires("libiberty/9.1.0")
             self.requires("libunwind/1.5.0")
-        if Version(self.version) >= "2020.08.10.00":
+        if Version(self.version) >= "2022.10.03.00":
+            self.requires("fmt/9.1.0")
+        elif Version(self.version) >= "2020.08.10.00":
             self.requires("fmt/7.1.3")
 
     @property

recipes/folly/all/patches/0023-find-packages.patch

@@ -0,0 +1,86 @@
+diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+index 989259a87..fcca6b1ab 100644
+--- a/CMake/folly-deps.cmake
++++ b/CMake/folly-deps.cmake
+@@ -48,25 +48,25 @@ find_package(Boost 1.51.0 MODULE
+ list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
+
+-find_package(DoubleConversion MODULE REQUIRED)
+-list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
+-
+-find_package(Gflags MODULE)
+-set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
+-if(LIBGFLAGS_FOUND)
+-  list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
+-  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
+-  set(FOLLY_LIBGFLAGS_LIBRARY ${LIBGFLAGS_LIBRARY})
+-  set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
++find_package(double-conversion REQUIRED)
++list(APPEND FOLLY_LINK_LIBRARIES ${double-conversion_LIBRARIES})
++list(APPEND FOLLY_INCLUDE_DIRECTORIES ${double-conversion_INCLUDE_DIR})
++
++find_package(gflags)
++set(FOLLY_HAVE_LIBGFLAGS ${gflags_FOUND})
++if(gflags_FOUND)
++  list(APPEND FOLLY_LINK_LIBRARIES ${gflags_LIBRARIES})
++  list(APPEND FOLLY_INCLUDE_DIRECTORIES ${gflags_INCLUDE_DIR})
++  set(FOLLY_LIBGFLAGS_LIBRARY ${gflags_LIBRARIES})
++  set(FOLLY_LIBGFLAGS_INCLUDE ${gflags_INCLUDE_DIR})
+ endif()
+
+-find_package(Glog MODULE)
+-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
+-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
++find_package(glog MODULE)
++set(FOLLY_HAVE_LIBGLOG ${glog_FOUND})
++list(APPEND FOLLY_LINK_LIBRARIES ${glog_LIBRARIES})
++list(APPEND FOLLY_INCLUDE_DIRECTORIES ${glog_INCLUDE_DIR})
+
+-find_package(LibEvent MODULE REQUIRED)
++find_package(Libevent MODULE REQUIRED)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
+
+@@ -104,14 +104,14 @@ if (LIBLZMA_FOUND)
+   list(APPEND FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
+ endif()
+
+-find_package(LZ4 MODULE)
++find_package(lz4 MODULE)
+ set(FOLLY_HAVE_LIBLZ4 ${LZ4_FOUND})
+ if (LZ4_FOUND)
+   list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LZ4_INCLUDE_DIR})
+   list(APPEND FOLLY_LINK_LIBRARIES ${LZ4_LIBRARY})
+ endif()
+
+-find_package(Zstd MODULE)
++find_package(zstd MODULE)
+ set(FOLLY_HAVE_LIBZSTD ${ZSTD_FOUND})
+ if(ZSTD_FOUND)
+   list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
+@@ -125,11 +125,11 @@ if (SNAPPY_FOUND)
+   list(APPEND FOLLY_LINK_LIBRARIES ${SNAPPY_LIBRARY})
+ endif()
+
+-find_package(LibDwarf)
++find_package(libdwarf)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBDWARF_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBDWARF_INCLUDE_DIRS})
+
+-find_package(Libiberty)
++find_package(libiberty)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBIBERTY_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBIBERTY_INCLUDE_DIRS})
+
+@@ -141,7 +141,7 @@ find_package(LibUring)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBURING_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBURING_INCLUDE_DIRS})
+
+-find_package(Libsodium)
++find_package(libsodium)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBSODIUM_LIBRARIES})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBSODIUM_INCLUDE_DIRS})
+