Bump the vcpkg builtin-baseline and remove most custom ports.
#4553
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
They were introduced in TileDB-Inc#3950 (which says it just copied them from upstream vcpkg) and have not been modified since.
It is a copy of the upstream one.
It has only one change which is no longer needed.
|
This pull request has been linked to Shortcut Story #37848: Bump the vcpkg builtin baseline and remove most remaining custom ports.. |
Catch now fails when encountering them.
On Linux it found somewhere a liblzma header and so enabled support for it, but could not link to liblzma. Now if the specific compression feature is not enabled, support will be explicitly disabled when configuring. Because we don't use the `MAGIC_COMPRESS` flag anywhere, we don't have to enable these features.
|
It would be useful to make progress along these lines. It is not necessary to make all that progress in a single PR. From a cursory glance, it looks like it's failing on |
|
Thanks for the feedback. I reverted the libmagic update for now and opened SC-38521 to track it. |
|
CI is green. Undrafting and marking as pending for 2.21, per discussions with @KiterLuc. |
KiterLuc
approved these changes
Jan 25, 2024
This was referenced Jan 26, 2024
Merged
github-actions bot
pushed a commit
that referenced
this pull request
Feb 5, 2024
This PR removes some unused code, specifically: * A patch file that should have been removed in #4553. * The `EncryptionKeyValidation` class that is unused since #1197. * Setting CMake policies to NEW that are already set by `cmake_minimum_required(VERSION 3.21)` --- TYPE: NO_HISTORY (cherry picked from commit 49e8752)
KiterLuc
pushed a commit
that referenced
this pull request
Mar 12, 2024
[SC-38521](https://app.shortcut.com/tiledb-inc/story/38521/update-libmagic-and-use-the-upstream-vcpkg-port) Split from #4553. This PR updates libmagic to version 5.45 and switches to using a vcpkg port closer to the upstream one, which we can easily consume with find_package(unofficial-libmagic) since microsoft/vcpkg#35274. One complication is that the upstream port builds libmagic with its official autotools-based build system, which is significantly slower on Windows (on Linux it builds pretty fast). I tried to upstream the CMake-based port I had added in #4119, but the PR was rejected. Apart from binary caching, there is unfortunately nothing we can do about the build performance regression. We could maintain the CMake-based port for our own use, but it will split what we build and what a future user of TileDB from vcpkg will build, and that port is not without its problems (it failed for example when I tried cross-compiling to arm64-windows, because it tried to execute the arm64 file.exe on my x64 machine). --- TYPE: BUILD DESC: Update libmagic to version 5.45
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SC-37848
This PR bumps the vcpkg
builtin-baselinewhich causes all of our dependencies to be updated to the most recent versions available on vcpkg. This removes the need for our custom ports and most were removed. The README of the ports folder was also updated to highlight that custom ports should be temporary.Apart from the remaining port overlays in the
portsdirectory, the precise package versions we are using can be found in https://github.com/microsoft/vcpkg/blob/72010900b7cee36cea77aebb97695095c9358eaf/versions/baseline.json.TYPE: BUILD
DESC: Update vcpkg version baseline to microsoft/vcpkg@7201090.