Merge branch 'main' into expo-histo-aggregation-4

ethandmd · web-flow · commit bc96a2fcb2fa · 2025-04-07T22:00:43.000-07:00
diff --git a/install/conan/conanfile_latest.txt b/install/conan/conanfile_latest.txt
@@ -26,6 +26,7 @@ abseil/*:fPIC=True
 abseil/*:shared=False
 opentracing-cpp/*:fPIC=True
 opentracing-cpp/*:shared=True
+pcre2/*:with_bzip2=False
 
 [test_requires]
 gtest/1.16.0
diff --git a/install/conan/conanfile_stable.txt b/install/conan/conanfile_stable.txt
@@ -26,6 +26,7 @@ abseil/*:fPIC=True
 abseil/*:shared=False
 opentracing-cpp/*:fPIC=True
 opentracing-cpp/*:shared=True
+pcre2/*:with_bzip2=False
 
 [test_requires]
 gtest/1.14.0
