Un-downgrade tracy-client-sys accidentally caused by feature selection #4346
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
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.
I failed to copy from upstream all the cargo features visible in tracy-client-sys when updating our local override of it
As a result, when doing a recent build, cargo helpfully failed to satisfy
tracy-client's dependency ontracy-client-sysusing the lockedtracy-client-sys 0.22.2(which selects the local override) and instead added an additional downgraded dependency ontracy-client-sys 0.22.1. Of course this also has the unfortunate side effect of not using our local copy of the C++ tracy client library at all, including any local patching we've had to do to make it build (eg. ignoring an fscanf return value as required by gcc 11).Anyway short story long the fix is just to add the necessary features, delete the auxiliary tracy-client-sys 0.22.1 dependency, and fix any fallout.
(Note that this also causes the host-dep-tree-curr.txt entry to change to
inexact-- because it's just pointing to an in-tree patched version oftracy-client-sys-- which on the one hand it's never been before, but on the other hand is probably correct-ish? I.e. I think it's probably the case that the hash we had in there before for 0.20.0 was wrong, because it would have been the checksum of the crates.io package and we literally never built against that, I think it just wound up in the lockfile by accident while I was originally iterating on getting the cross-language tracy build working.)