From 06e31f417c2654e57e20b66f5884d6e2c5f3fece Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Fri, 12 Dec 2025 12:40:35 +0000 Subject: [PATCH] reverting to abseil/20240722.0 Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> --- conan.lock | 7 ++----- conan/profiles/sanitizers | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/conan.lock b/conan.lock index e9787516d2..3be921d876 100644 --- a/conan.lock +++ b/conan.lock @@ -24,7 +24,7 @@ "c-ares/1.34.5#5581c2b62a608b40bb85d965ab3ec7c8%1764175359.429", "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1764175359.429", "boost/1.88.0#8852c0b72ce8271fb8ff7c53456d4983%1756223752.326", - "abseil/20250814.0#c7e85f3abefdd1e05d0a8118f3320417%1761741487.631" + "abseil/20240722.0#e8c91093c9a16e51fa48a4a214dad9e9" ], "build_requires": [ "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497", @@ -38,7 +38,7 @@ "b2/5.3.3#107c15377719889654eb9a162a673975%1756234226.28", "automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56", "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86", - "abseil/20250814.0#c7e85f3abefdd1e05d0a8118f3320417%1761741487.631" + "abseil/20240722.0#e8c91093c9a16e51fa48a4a214dad9e9" ], "python_requires": [], "overrides": { @@ -56,9 +56,6 @@ ], "lz4/[>=1.9.4 <2]": [ "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504" - ], - "abseil/[>=20240116.1 <=20250127.0]": [ - "abseil/20250814.0#c7e85f3abefdd1e05d0a8118f3320417" ] }, "config_requires": [] diff --git a/conan/profiles/sanitizers b/conan/profiles/sanitizers index c452a82eda..a572dcb958 100644 --- a/conan/profiles/sanitizers +++ b/conan/profiles/sanitizers @@ -31,7 +31,6 @@ include(default) # Work around by disabling Abseil's V2 constant init logic {% set extra_cxxflags = extra_cxxflags ~ " -DABSL_ENABLE_CONSTANT_INIT_V2=0" %} abseil/*:tools.build:defines+=['ABSL_ENABLE_CONSTANT_INIT_V2=0'] - abseil/*:tools.build:cflags+=['-DABSL_ENABLE_CONSTANT_INIT_V2=0'] {% endif %} tools.build:cxxflags+=['{{sanitizer_flags}} {{extra_cxxflags}}']