valgrind: fix build on darwin #52014
Conversation
GrahamcOfBorg
added
6.topic: darwin
|
I can not test or judge anything for darwin but I can trigger the build. |
|
Should maybe be based against staging? |
|
Thanks, looks like it builds :) Yeah I can change to staging, I guess I misjudged the amounts of rebuilds based on the newly failed jobs on hydra which indicated more on the order of 300ish. |
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
force-pushed
the
fix-darwin-valgrind
branch
from
bf42857
to
a6d4a0c
Compare
GrahamcOfBorg
added
10.rebuild-darwin: 11-100
and removed
10.rebuild-darwin: 501+
labels
|
@LnL7 not sure if it's worth it to cherry pick this to master, it doesn't cause any rebuilds on linux at least. Though it would rebuild a bunch of stuff which would become obsolete as soon as your glu commit hits master. (sorry for breaking darwin btw. will be more careful in the future). |
|
Yeah this could have gone to master, given that it only rebuilds things that where broken in the first place. I also pushed a change to staging to avoid it as a dependency for a large tree of packages. |
|
Guess I should've stuck to my guts, and also cced you earlier, still getting the hang of being able to commit. Any problems cherry picking it now that it is staging? |
|
Yes - cherry pick to master would be good. this is breaking quite a few packages in trunk now. |
Motivation for this change
We fixed a race condition in #51505 and #51107. This required running
autoreconfHook to pick up the
coregrind-makefile-race.patchpatch.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.cc @srhb (if you could trigger an ofborg build on darwin that would be great waiting on trusted users merge atm).