parallel-netcdf: add v1.13.0, mark conflict on macOS#46811
Closed
adamjstewart wants to merge 2 commits intospack:developfrom
Closed
parallel-netcdf: add v1.13.0, mark conflict on macOS#46811adamjstewart wants to merge 2 commits intospack:developfrom
adamjstewart wants to merge 2 commits intospack:developfrom
Conversation
Member
Member
Author
|
May be superseded by #46264, but we should merge one of these 2 PRs soon. |
Contributor
tldahlgren
approved these changes
Oct 7, 2024
Contributor
tldahlgren
left a comment
tldahlgren
left a comment
There was a problem hiding this comment.
Confirmed the version sha256.
tldahlgren
changed the title
Contributor
|
I'll admit I don't love this being conflicted as it immediately breaks much of the macOS workflow. Is 46598 not close to being merged? |
Contributor
Member
|
To be clear, the conflict must be removed. I have no problem building the package on macOS because there are no extra rpaths in my compiler configuration file. |
Member
Author
|
Closing in favor of the other PR. |
3 tasks
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
4 participants
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.
Can't get this to build on macOS with Xcode 16, and possibly with Xcode 15. Opened an issue upstream. Let's add a conflict for now.