Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 'elf.h' file not found on macOS 10.15 #1789

Merged
merged 1 commit into from
Oct 5, 2020

Conversation

omajid
Copy link
Member

@omajid omajid commented Oct 2, 2020

See: #1744

This is a backport of the fix that was merged into runtime for master: dotnet/runtime#42756

See: dotnet#1744

This is a backport of the fix that was merged into runtime for master:
dotnet/runtime#42756
@omajid
Copy link
Member Author

omajid commented Oct 2, 2020

cc @janvorli @asbjornu @dagood

@omajid
Copy link
Member Author

omajid commented Oct 2, 2020

This PR is against release/3.1. I have no plans to do this for 5.0, since I assume we can pick that up automatically when the original runtime fix (currently only in master) is merged into runtime's release/5.0 branch.

I suppose I can try to get this into coreclr's release/3.1 as well ...

@dagood
Copy link
Member

dagood commented Oct 2, 2020

when the original runtime fix (currently only in master) is merged into runtime's release/5.0 branch.

Do you know if this is planned? I don't see a port PR (via PR threads or any backlinks in them).

Copy link
Member

@dagood dagood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thank you. (And @janvorli for the change.)

@omajid
Copy link
Member Author

omajid commented Oct 2, 2020

Do you know if this is planned?

The milestone on dotnet/runtime#42756 is "5.0.0"... so I guess? Not sure.

@omajid
Copy link
Member Author

omajid commented Oct 5, 2020

Maybe we should close this PR and wait for dotnet/coreclr#28106 to be merged into 3.1?

@janvorli
Copy link
Member

janvorli commented Oct 5, 2020

@omajid it is not clear if it would be approved for 3.1 and even if it was approved, it would take some time before it gets merged. Usually the approved PRs to 3.1 are merged after the upcoming version of .NET Core 3.1 is released and then released in the version after that. So the soonest, it might get merged into release/3.1 branch after 3.1.9 is released.

@dagood
Copy link
Member

dagood commented Oct 5, 2020

A couple things changed since this all started:

  1. The fix got more complicated.
  2. It looks like it might not be ok for a homebrew package to reference a commit rather than a tag: dotnet 3.1.108 (new formula) Homebrew/homebrew-core#60929 (comment).

The fix is still relatively small and still localized in a single file, and there's active work going on to port the fix to branches sooner rather than later, so I still don't object based on that.

But it would be better for you to take the patch as a homebrew patch! That way, you can stay on a tag, so you can unblock yourself without worrying about (2).

These two approaches are not mutually exclusive, so I'm going to merge now, however if you think you can get this working before November, I urge you to take the patch in homebrew rather than blocking yourself by depending on the tagless merge commit.


For reference:
master: dotnet/runtime#42756
release/5.0: dotnet/runtime#43031
release/3.1: dotnet/coreclr#28106

@dagood dagood merged commit 0202230 into dotnet:release/3.1 Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants