Skip to content

[VL] Upgrade vcpkg builtin-baseline#11004

Merged
philo-he merged 4 commits intoapache:mainfrom
philo-he:upgrade-vcpkg-baseline
Nov 18, 2025
Merged

[VL] Upgrade vcpkg builtin-baseline#11004
philo-he merged 4 commits intoapache:mainfrom
philo-he:upgrade-vcpkg-baseline

Conversation

@philo-he
Copy link
Copy Markdown
Member

@philo-he philo-he commented Nov 3, 2025

What changes are proposed in this pull request?

Upgrade vcpkg baseline to easily use newer libraries and build tools. The latest tag 2025.10.17 requires a higher ninja version which is not compatible with Centos 7 glibc. So tag 2025.09.17 is set in this PR.

How was this patch tested?

CI.

@github-actions github-actions Bot added the BUILD label Nov 3, 2025
@philo-he philo-he marked this pull request as draft November 3, 2025 08:19
@zhouyuan
Copy link
Copy Markdown
Member

zhouyuan commented Nov 3, 2025

@philo-he as Gluten already defined overlays, directly bumping is not working, note initially we have already included some compiler fixes for Gcc-11
main...zhouyuan:gluten:main_docker_fix_1027

@philo-he
Copy link
Copy Markdown
Member Author

philo-he commented Nov 4, 2025

@philo-he as Gluten already defined overlays, directly bumping is not working, note initially we have already included some compiler fixes for Gcc-11 main...zhouyuan:gluten:main_docker_fix_1027

@zhouyuan, thanks for the review. I assume these overlays are prioritized to be used. With baseline upgraded, I expect we can directly use upstream ports for some new versions of dependency libraries, which can ease the maintenance.

@philo-he philo-he force-pushed the upgrade-vcpkg-baseline branch 2 times, most recently from ea31340 to 0f42af0 Compare November 17, 2025 04:12
@zhouyuan
Copy link
Copy Markdown
Member

@philo-he I think we will also need to

@philo-he
Copy link
Copy Markdown
Member Author

@philo-he I think we will also need to

@zhouyuan, it seems they can be fixed in separate PRs? If so, we can first merge this one once all failures are fixed. I note some libs are not consistent with Velox's setup versions for a long time.

@philo-he philo-he marked this pull request as ready for review November 17, 2025 13:30
Copy link
Copy Markdown
Member

@zhouyuan zhouyuan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment thread dev/vcpkg/init.sh

if [ ! -d "$VCPKG_ROOT" ] || [ -z "$(ls "$VCPKG_ROOT")" ]; then
git clone https://github.com/microsoft/vcpkg.git --branch 2023.10.19 "$VCPKG_ROOT"
git clone https://github.com/microsoft/vcpkg.git --branch 2025.09.17 "$VCPKG_ROOT"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2025.09.17
it seems not match the PR desc here

Comment thread dev/vcpkg/vcpkg.json
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"builtin-baseline": "a7b6122f6b6504d16d96117336a0562693579933",
"builtin-baseline": "4334d8b4c8916018600212ab4dd4bbdc343065d1",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we also add a note for this commit: branch 2025.09.17

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems adding comments is not recommended for JSON file. So I just added an Overview section in dev/vcpkg/README.md to clarify this. Thanks.

@philo-he philo-he force-pushed the upgrade-vcpkg-baseline branch from 0f42af0 to 0368c07 Compare November 18, 2025 05:58
@github-actions github-actions Bot added the DOCS label Nov 18, 2025
@philo-he
Copy link
Copy Markdown
Member Author

philo-he commented Nov 18, 2025

I just tested this PR with GCC 13 docker. Those dependency libraries can be built successfully with GCC 13. But when building velox, some errors related to folly are reported to complain the use of uninitialized variable, which should be caused by stricter check of GCC 13. I think we can fix them by upgrading folly in another PR.

@philo-he philo-he merged commit 63f5b7b into apache:main Nov 18, 2025
9 checks passed
@philo-he philo-he deleted the upgrade-vcpkg-baseline branch November 18, 2025 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants