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

valgrind: run autoconf to pick up Makefile.am patch #51505

Merged
merged 1 commit into from Dec 5, 2018

Conversation

hedning
Copy link
Contributor

@hedning hedning commented Dec 4, 2018

Motivation for this change

#51107 added a patch to Makefile.am to fix
a race condition in the build. It was unfortunately never picked up as we were
using the generated makefile from the tarball.

cc #51444 and @srhb

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

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.
@srhb
Copy link
Contributor

srhb commented Dec 4, 2018

Oops, thanks!

@srhb srhb self-requested a review December 4, 2018 12:53
@hedning
Copy link
Contributor Author

hedning commented Dec 5, 2018

Merging to catch the next staging-next eval.

@hedning hedning merged commit 13ee780 into NixOS:staging-next Dec 5, 2018
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)
@hedning hedning deleted the valgrind-run-autoconf branch October 15, 2019 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants