[Android] Workaround for invalid return value from clock_nanosleep #21433
Conversation
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
lambdageek
approved these changes
Feb 16, 2022
akoeplinger
approved these changes
Feb 16, 2022
Member
|
/backport to 2020-02 |
Contributor
|
Started backporting to 2020-02: https://github.com/mono/mono/actions/runs/1857931585 |
Contributor
|
@akoeplinger backporting to 2020-02 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Backport https://github.com/dotnet/runtime/pull/64679
Using index info to reconstruct a base tree...
M mono/eglib/Makefile.am
M mono/eglib/glib.h
M mono/mini/mini-posix.c
M mono/utils/mono-threads.c
Falling back to patching base and 3-way merge...
Auto-merging mono/utils/mono-threads.c
Auto-merging mono/mini/mini-posix.c
CONFLICT (content): Merge conflict in mono/mini/mini-posix.c
Auto-merging mono/eglib/glib.h
Auto-merging mono/eglib/Makefile.am
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Backport https://github.com/dotnet/runtime/pull/64679
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
akoeplinger
pushed a commit
to akoeplinger/mono
that referenced
this pull request
Feb 17, 2022
…ono#21433) Fixes dotnet/android#6600 Backported from dotnet/runtime#64679 and dotnet/runtime#65373 (cherry picked from commit 36daf03)
Member
|
Manual backport: #21435 |
akoeplinger
added a commit
that referenced
this pull request
Feb 17, 2022
…osleep (#21435) * [Android] Workaround for invalid return value from clock_nanosleep (#21433) Fixes dotnet/android#6600 Backported from dotnet/runtime#64679 and dotnet/runtime#65373 (cherry picked from commit 36daf03) * Fix Windows build Co-authored-by: Simon Rozsival <[email protected]>
ThomasKuehne
pushed a commit
to ThomasKuehne/mono
that referenced
this pull request
Mar 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Fixes dotnet/android#6600
Backported from dotnet/runtime#64679 and dotnet/runtime#65373