From ed550ebb7c06d5af2e87b14d5986ce4c55a23397 Mon Sep 17 00:00:00 2001 From: congqixia Date: Mon, 4 Dec 2023 14:06:40 +0800 Subject: [PATCH] enhance: [cherry-pick] Resolve libunwind requirement conflict using 1.7.2 (#28935) Cherry-pick from master pr: #28929 Try to resolve libunwind dependency requirement conflict between glog & folly Signed-off-by: Congqi Xia --- internal/core/conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/core/conanfile.py b/internal/core/conanfile.py index 43557b8b8f..7d47ab5ca5 100644 --- a/internal/core/conanfile.py +++ b/internal/core/conanfile.py @@ -85,6 +85,7 @@ class MilvusConan(ConanFile): if self.settings.os != "Macos": # MacOS does not need openblas self.requires("openblas/0.3.23@milvus/dev") + self.requires("libunwind/1.7.2") def imports(self): self.copy("*.dylib", "../lib", "lib")