From d4017ab4f3733815cda34eaa17c576200551795d Mon Sep 17 00:00:00 2001 From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com> Date: Sun, 11 Feb 2024 12:53:39 -0600 Subject: [PATCH 1/2] Update to use libdwarf 0.9.1 --- recipes/folly/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/folly/all/conanfile.py b/recipes/folly/all/conanfile.py index 06dc6965155a7..6a14d43cb9182 100755 --- a/recipes/folly/all/conanfile.py +++ b/recipes/folly/all/conanfile.py @@ -85,7 +85,7 @@ def requirements(self): self.requires("zlib/1.2.12") self.requires("zstd/1.5.2") if not is_msvc(self): - self.requires("libdwarf/20191104") + self.requires("libdwarf/0.9.1") self.requires("libsodium/1.0.18") self.requires("xz_utils/5.2.5") # FIXME: Causing compilation issues on clang: self.requires("jemalloc/5.2.1") From b5a30d35cbf7b1e6a8dfa0ddd26f6af220af739d Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:04:35 +0100 Subject: [PATCH 2/2] Fix is_msvc conditional --- recipes/folly/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/folly/all/conanfile.py b/recipes/folly/all/conanfile.py index 6a14d43cb9182..c94ec644ceb93 100755 --- a/recipes/folly/all/conanfile.py +++ b/recipes/folly/all/conanfile.py @@ -177,7 +177,7 @@ def _configure_cmake(self): cxx_std_flag = tools.cppstd_flag(self.settings) cxx_std_value = cxx_std_flag.split('=')[1] if cxx_std_flag else "c++{}".format(self._minimum_cpp_standard) cmake.definitions["CXX_STD"] = cxx_std_value - if is_msvc: + if is_msvc(self): cmake.definitions["MSVC_LANGUAGE_VERSION"] = cxx_std_value cmake.definitions["MSVC_ENABLE_ALL_WARNINGS"] = False cmake.definitions["MSVC_USE_STATIC_RUNTIME"] = "MT" in msvc_runtime_flag(self)