valgrind: Apply upstream patch for Makefile race in coregrind #51107
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
10 tasks
|
Hmm, not actually sure that URL is stable... Investigating. |
srhb
force-pushed
the
valgrind-coregrind-makefile-race
branch
from
20c8bdb
to
a067e88
Compare
|
Vendored the patch. Should be obvious when we need to get rid of it. :) |
|
@FRidh Are you okay with adding this to staging-next? fwiw last eval after master was merged into staging-next failed again: https://hydra.nixos.org/build/84945477 |
|
Success on x86_64-linux (full log) Attempted: valgrind Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: valgrind Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: valgrind Partial log (click to expand)
|
|
This pull request has been mentioned on Nix community. There might be relevant details there: https://discourse.nixos.org/t/cherry-picking-commits-to-upgrade-unstable-nixos-channels/1553/1 |
hedning
added a commit
to hedning/nixpkgs
that referenced
this pull request
Dec 4, 2018
NixOS#51107 added a patch to Makefile.am to fix a race condition in the build. It was unfortunately never picked up as we we're using the generated makefile from the tarball.
10 tasks
hedning
added a commit
to hedning/nixpkgs
that referenced
this pull request
Dec 14, 2018
We fixed a race condition in NixOS#51505 and NixOS#51107. This required running autoreconfHook to pick up the `coregrind-makefile-race.patch` patch. Unfortunately this broke darwin's postPatch fixes as autoreconfHook would run afterwards regenerating the fixed makefiles. Moving the postPatch fixes to preConfigure should resolve the issue. I left `postPatch = ""` in to avoid a rebuild on linux.
hedning
added a commit
to hedning/nixpkgs
that referenced
this pull request
Dec 19, 2018
We fixed a race condition in NixOS#51505 and NixOS#51107. This required running autoreconfHook to pick up the `coregrind-makefile-race.patch` patch. Unfortunately this broke darwin's postPatch fixes as autoreconfHook would run afterwards regenerating the fixed makefiles. Moving the postPatch fixes to preConfigure should resolve the issue. I left `postPatch = ""` in to avoid a rebuild on linux. (cherry picked from commit a6d4a0c)
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.
Motivation for this change
Supercedes #51082
Thanks @delroth for noticing the commit upstream. :)
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)