arrow-cpp: fixup after protobuf bump#249420
Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom Aug 16, 2023
Merged
Conversation
Member
|
@ofborg eval |
This file contains hidden or 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.
Description of changes
This solves a CMake dependency resolution issue. Arrows
FindProtobufAltmodule looks forProtobufwith an uppercase P, which is matched by another find module that is provided by CMake itself. When it gets to look forgrpcthat tries to resolveprotobufwith a lowercase p, which is matched by the upstream providedprotobuf-config.cmake. At this point conflicting target definitions are detected and the configuration process aborts.The patch proposed here modifies the arrow module so that it will
protobuf-config.cmakeas well.Targeting #248496.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)