Skip to content

Move b2 override into existing replace_tool_requires section #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfpanisset merged 1 commit into from
Apr 25, 2025
Merged

Move b2 override into existing replace_tool_requires section #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/conan/settings/profiles_aswf/vfx2024
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ include(ci_common4)
# Build everything as shared libs by default
*:shared=True
[tool_requires]
b2/*: b2/5.2.1@aswf/vfx2024
[replace_requires]
boost/*: boost/1.82.0@aswf/vfx2024
brotli/*: brotli/system@aswf/vfx2024
Expand Down Expand Up @@ -82,6 +81,7 @@ yaml-cpp/*: yaml-cpp/0.8.0@aswf/vfx2024
zlib/*: zlib/1.3.1@aswf/vfx2024
zstd/*: zstd/1.5.6@aswf/vfx2024
[replace_tool_requires]
b2/*: b2/5.2.1@aswf/vfx2024
bison/*: bison/3.0.4@system
flex/*: flex/2.6.1@system
gperf/*: gperf/3.1@system
Expand Down
2 changes: 1 addition & 1 deletion packages/conan/settings/profiles_aswf/vfx2025
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ include(ci_common5)
# Build everything as shared libs by default
*:shared=True
[tool_requires]
b2/*: b2/5.2.1@aswf/vfx2025
[replace_requires]
boost/*: boost/1.85.0@aswf/vfx2025
brotli/*: brotli/system@aswf/vfx2025
Expand Down Expand Up @@ -82,6 +81,7 @@ yaml-cpp/*: yaml-cpp/0.8.0@aswf/vfx2025
zlib/*: zlib/1.3.1@aswf/vfx2025
zstd/*: zstd/1.5.6@aswf/vfx2025
[replace_tool_requires]
b2/*: b2/5.2.1@aswf/vfx2025
bison/*: bison/3.0.4@system
flex/*: flex/2.6.1@system
gperf/*: gperf/3.1@system
Expand Down
2 changes: 1 addition & 1 deletion packages/conan/settings/profiles_aswftesting/vfx2024
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ include(ci_common4)
# Build everything as shared libs by default
*:shared=True
[tool_requires]
b2/*: b2/5.2.1@aswftesting/vfx2024
[replace_requires]
boost/*: boost/1.82.0@aswftesting/vfx2024
brotli/*: brotli/system@aswftesting/vfx2024
Expand Down Expand Up @@ -82,6 +81,7 @@ yaml-cpp/*: yaml-cpp/0.8.0@aswftesting/vfx2024
zlib/*: zlib/1.3.1@aswftesting/vfx2024
zstd/*: zstd/1.5.6@aswftesting/vfx2024
[replace_tool_requires]
b2/*: b2/5.2.1@aswftesting/vfx2024
bison/*: bison/3.0.4@system
flex/*: flex/2.6.1@system
gperf/*: gperf/3.1@system
Expand Down
2 changes: 1 addition & 1 deletion packages/conan/settings/profiles_aswftesting/vfx2025
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ include(ci_common5)
# Build everything as shared libs by default
*:shared=True
[tool_requires]
b2/*: b2/5.2.1@aswftesting/vfx2025
[replace_requires]
boost/*: boost/1.85.0@aswftesting/vfx2025
brotli/*: brotli/system@aswftesting/vfx2025
Expand Down Expand Up @@ -82,6 +81,7 @@ yaml-cpp/*: yaml-cpp/0.8.0@aswftesting/vfx2025
zlib/*: zlib/1.3.1@aswftesting/vfx2025
zstd/*: zstd/1.5.6@aswftesting/vfx2025
[replace_tool_requires]
b2/*: b2/5.2.1@aswftesting/vfx2025
bison/*: bison/3.0.4@system
flex/*: flex/2.6.1@system
gperf/*: gperf/3.1@system
Expand Down
Loading