Skip to content

Commit f2db03d

Browse files
committed
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 <[email protected]>
1 parent 0129c6c commit f2db03d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

packages/conan/settings/profiles_aswf/vfx2024

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ include(ci_common4)
55
# Build everything as shared libs by default
66
*:shared=True
77
[tool_requires]
8-
[replace_requires]
98
b2/*: b2/5.2.1@aswf/vfx2024
9+
[replace_requires]
1010
boost/*: boost/1.82.0@aswf/vfx2024
1111
brotli/*: brotli/system@aswf/vfx2024
1212
bzip2/*: bzip2/1.0.8@aswf/vfx2024

packages/conan/settings/profiles_aswf/vfx2025

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ include(ci_common5)
55
# Build everything as shared libs by default
66
*:shared=True
77
[tool_requires]
8-
[replace_requires]
98
b2/*: b2/5.2.1@aswf/vfx2025
9+
[replace_requires]
1010
boost/*: boost/1.85.0@aswf/vfx2025
1111
brotli/*: brotli/system@aswf/vfx2025
1212
bzip2/*: bzip2/1.0.8@aswf/vfx2025

packages/conan/settings/profiles_aswftesting/vfx2024

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ include(ci_common4)
55
# Build everything as shared libs by default
66
*:shared=True
77
[tool_requires]
8-
[replace_requires]
98
b2/*: b2/5.2.1@aswftesting/vfx2024
9+
[replace_requires]
1010
boost/*: boost/1.82.0@aswftesting/vfx2024
1111
brotli/*: brotli/system@aswftesting/vfx2024
1212
bzip2/*: bzip2/1.0.8@aswftesting/vfx2024

packages/conan/settings/profiles_aswftesting/vfx2025

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ include(ci_common5)
55
# Build everything as shared libs by default
66
*:shared=True
77
[tool_requires]
8-
[replace_requires]
98
b2/*: b2/5.2.1@aswftesting/vfx2025
9+
[replace_requires]
1010
boost/*: boost/1.85.0@aswftesting/vfx2025
1111
brotli/*: brotli/system@aswftesting/vfx2025
1212
bzip2/*: bzip2/1.0.8@aswftesting/vfx2025

0 commit comments

Comments
 (0)