From 56a52ade5e8be7ebfa02b4ee8c6cd3c2148e5d18 Mon Sep 17 00:00:00 2001 From: Jean-Francois Panisset Date: Thu, 24 Apr 2025 22:12:14 -0700 Subject: [PATCH] b2 is a tool_requires Override of b2 version belongs in tool_requires section, otherwise we pick up Conan Central binary package which is compiled against newer libstdc++ version than we have in EL 8. Signed-off-by: Jean-Francois Panisset --- packages/conan/settings/profiles_aswf/vfx2024 | 2 +- packages/conan/settings/profiles_aswf/vfx2025 | 2 +- packages/conan/settings/profiles_aswftesting/vfx2024 | 2 +- packages/conan/settings/profiles_aswftesting/vfx2025 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/conan/settings/profiles_aswf/vfx2024 b/packages/conan/settings/profiles_aswf/vfx2024 index 6d8f9868..e4df08ed 100644 --- a/packages/conan/settings/profiles_aswf/vfx2024 +++ b/packages/conan/settings/profiles_aswf/vfx2024 @@ -5,8 +5,8 @@ include(ci_common4) # Build everything as shared libs by default *:shared=True [tool_requires] -[replace_requires] b2/*: b2/5.2.1@aswf/vfx2024 +[replace_requires] boost/*: boost/1.82.0@aswf/vfx2024 brotli/*: brotli/system@aswf/vfx2024 bzip2/*: bzip2/1.0.8@aswf/vfx2024 diff --git a/packages/conan/settings/profiles_aswf/vfx2025 b/packages/conan/settings/profiles_aswf/vfx2025 index 5933cda9..a7e0abce 100644 --- a/packages/conan/settings/profiles_aswf/vfx2025 +++ b/packages/conan/settings/profiles_aswf/vfx2025 @@ -5,8 +5,8 @@ include(ci_common5) # Build everything as shared libs by default *:shared=True [tool_requires] -[replace_requires] b2/*: b2/5.2.1@aswf/vfx2025 +[replace_requires] boost/*: boost/1.85.0@aswf/vfx2025 brotli/*: brotli/system@aswf/vfx2025 bzip2/*: bzip2/1.0.8@aswf/vfx2025 diff --git a/packages/conan/settings/profiles_aswftesting/vfx2024 b/packages/conan/settings/profiles_aswftesting/vfx2024 index b588b08f..cbaf2d01 100644 --- a/packages/conan/settings/profiles_aswftesting/vfx2024 +++ b/packages/conan/settings/profiles_aswftesting/vfx2024 @@ -5,8 +5,8 @@ include(ci_common4) # Build everything as shared libs by default *:shared=True [tool_requires] -[replace_requires] b2/*: b2/5.2.1@aswftesting/vfx2024 +[replace_requires] boost/*: boost/1.82.0@aswftesting/vfx2024 brotli/*: brotli/system@aswftesting/vfx2024 bzip2/*: bzip2/1.0.8@aswftesting/vfx2024 diff --git a/packages/conan/settings/profiles_aswftesting/vfx2025 b/packages/conan/settings/profiles_aswftesting/vfx2025 index dbd0d207..3dd27262 100644 --- a/packages/conan/settings/profiles_aswftesting/vfx2025 +++ b/packages/conan/settings/profiles_aswftesting/vfx2025 @@ -5,8 +5,8 @@ include(ci_common5) # Build everything as shared libs by default *:shared=True [tool_requires] -[replace_requires] b2/*: b2/5.2.1@aswftesting/vfx2025 +[replace_requires] boost/*: boost/1.85.0@aswftesting/vfx2025 brotli/*: brotli/system@aswftesting/vfx2025 bzip2/*: bzip2/1.0.8@aswftesting/vfx2025