Commit 1bc1ad6

authored

Bump the vcpkg builtin-baseline. (#5616)

Fixes CORE-360. This PR bumps the vcpkg `builtin-baseline` which causes all of our dependencies to be updated to the most recent versions available on vcpkg. This also lets us to remove almost all of our port overlays. To view the full list of updated ports, you can clone vcpkg and run `git diff ea2a964f9303270322cf3f2d51c265ba146c422d 3b9d086009cc1c2256e9c28ad44a00036fbd9b26 -- .\versions\baseline.json > baseline.diff`. This is an abridged summary of the updated ports that we depend on: |Port|Old version|New version| |----|-----------|-----------| |aws-c-common|0.10.6|0.12.5| |aws-sdk-cpp|1.11.474|1.11.665| |azure-core-cpp|1.15.0|1.16.1| |azure-identity-cpp|1.10.1|1.13.2| |azure-storage-blobs-cpp|12.13.0|12.15.0| |azure-storage-files-datalake-cpp|12.12.0|12.13.0| |capnproto|1.1.0|1.2.0| |catch2|3.8.0|3.11.0| |curl|8.12.1|8.16.0| |fmt|11.0.2|12.0.0| |google-cloud-cpp|2.36.0|2.37.0| |libwebp|1.5.0|1.6.0| |libxml2|2.13.5|2.15.0| |openssl|3.4.1|3.6.0| |spdlog|1.15.2|1.16.0| The bump to the baseline might cause configure errors due to the vcpkg repository being out of date In this case, try one of the following things: * If you are using a cloned vcpkg repository and specified to the Core either a custom toolchain file, or the `VCPKG_ROOT` environment variable, update the vcpkg repository to the latest available commit, and try configuring again. * If you rely on the Core's build system to automatically download vcpkg (the default case), try deleting `build/_deps` and configure again. If it doesn't work, try performing a clean build. Let me know if any additional testing is required. --- TYPE: BUILD DESC: Update vcpkg version baseline to microsoft/vcpkg@3b9d086.

1 parent 32b9739 commit 1bc1ad6Copy full SHA for 1bc1ad6

File tree

76 files changed

+430

-2580

lines changed

.github/workflows
- ci-linux_mac.yml
cmake/Options
- TileDBToolchain.cmake
ports
test
- regression/targets
  - sc-36372.cc
- src
- support/src
  - helpers.cc
  - helpers.h
tiledb
- api/c_api/vfs/test
  - unit_capi_vfs.cc
- sm
  - filesystem
    - azure.cc
    - s3.cc
  - global_state
    - unit_test_config.h
  - serialization
    - tiledb-rest.capnp.c++
    - tiledb-rest.capnp.h
vcpkg.json

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+430

-2580

lines changed

`‎.github/workflows/ci-linux_mac.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ jobs:`
`143`	`143`	`if: inputs.manylinux`
`144`	`144`	`run: \|`
`145`	`145`	`set -e pipefail`
`146`		`- yum install -y redhat-lsb-core perl-IPC-Cmd curl zip unzip tar`
	`146`	`+ yum install -y redhat-lsb-core perl-IPC-Cmd perl-Time-Piece curl zip unzip tar`
`147`	`147`
`148`	`148`	`# This must happen after checkout, because checkout would remove the directory.`
`149`	`149`	`- name: Install Ninja`

`‎cmake/Options/TileDBToolchain.cmake‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)`
`36`	`36`	`# Inspired from https://github.com/Azure/azure-sdk-for-cpp/blob/azure-core_1.10.3/cmake-modules/AzureVcpkg.cmake`
`37`	`37`	`message("TILEDB_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")`
`38`	`38`	`# To help with resolving conflicts, when you update the commit, also update its date.`
`39`		`- set(VCPKG_COMMIT_STRING ea2a964f9303270322cf3f2d51c265ba146c422d) # 2025-04-01`
	`39`	`+ set(VCPKG_COMMIT_STRING 3b9d086009cc1c2256e9c28ad44a00036fbd9b26) # 2025-10-24`
`40`	`40`	`message("Vcpkg commit string used: ${VCPKG_COMMIT_STRING}")`
`41`	`41`	`include(FetchContent)`
`42`	`42`	`FetchContent_Declare(`

`‎ports/README.md‎`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,4 @@ For ease of review when patching existing ports, you are recommended to make one`
`32`	`32`
`33`	`33`	`\| Port \| Reason \|`
`34`	`34`	`\|---------------\|--------------------------------------------------------------------------\|`
`35`		-\| `aws-c-cal` \| Patching to remove unused OpenSSL dependency on Windows (vcpkg PR 44996) \|
`36`		-\| `aws-sdk-cpp` \| Patching to fix MinGW build failures. \|
`37`		-\| `capnproto` \| Patching to fix compatibility with CMake 4.0 (PR 2272) \|
`38`		-\| `crc32c` \| Patching to fix compatibility with CMake 4.0 (PR 68) \|
`39`		-\| `fmt` \| Patching to update to version 1.11.4 (vcpkg PR 44774) \|
`40`	`35`	\| `libfaketime` \| Port does not yet exist upstream \|
`41`		-\| `s2n` \| Patching to fix compatibility with CMake 4.0 (PR 4933) \|
`42`		-\| `spdlog` \| Patching to compile with `-fvisibility=hidden` \|

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 1bc1ad6

File tree

76 files changed

Some content is hidden

76 files changed

`‎.github/workflows/ci-linux_mac.yml‎`

`‎cmake/Options/TileDBToolchain.cmake‎`

`‎ports/README.md‎`

`‎ports/aws-c-cal/portfile.cmake‎`

`‎ports/aws-c-cal/remove-libcrypto-messages.patch‎`

`‎ports/aws-c-cal/vcpkg.json‎`

`‎ports/aws-sdk-cpp/find-dependency.patch‎`

`‎ports/aws-sdk-cpp/fix-aws-root.patch‎`

`‎ports/aws-sdk-cpp/fix-wininet-http2.patch‎`

`‎ports/aws-sdk-cpp/fix-winsock-headers.patch‎`

0 commit comments