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

[19.03] Static proot, wafHook cross compilation #59407

Merged
merged 7 commits into from Apr 15, 2019

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Apr 13, 2019

Motivation for this change

The main purpose is to quickly backport breaking changes to recently released wafHook. proot changes are just picked up along.

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 nix-review --run "nix-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.

symphorien and others added 7 commits April 13, 2019 12:30
this is necessary for talloc

(cherry picked from commit f075de5)
These options are forcefully added by pkgsStatic but are not understood
by waf.

(cherry picked from commit f23a215)
waf does support --build and --host, but the only effect of these
options is an error message telling to use --cross-compile instead.
So we ignore these flags.

(cherry picked from commit 1001d00)
for this to work, wafHook must be in nativeBuildInputs.

(cherry picked from commit 3d60a00)
(cherry picked from commit 52566c3)
This avoids the potential conflict between autoconf flags and the waf
flags. There is some overlap between the two but waf errors when it
doesn’t recognize the flag.

(cherry picked from commit a79a8f2)
@veprbl
Copy link
Member Author

veprbl commented Apr 13, 2019

As I mentioned in #58504 the nixos-19.03 is the first release to feature wafHook, so I expect that the change should have minimal impact at this point.

@veprbl veprbl merged commit 2bb5cc2 into NixOS:staging-19.03 Apr 15, 2019
@veprbl veprbl deleted the pr/static-proot_backport_staging branch December 1, 2020 17:02
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

4 participants