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

libcap: fix cross-compilation support #168303

Merged
merged 1 commit into from
Apr 12, 2022

Conversation

Mindavi
Copy link
Contributor

@Mindavi Mindavi commented Apr 11, 2022

Description of changes

Between libcap 2.51 and 2.52, the CROSS_COMPILE flag appears in more places.
Maybe it was already required before, but now the build fails due to it not being set.

Set it unconditionally.

Things done
  • Built on platform(s)
    • x86_64-linux (on staging-next for now, waiting for the staging build)
    • aarch64-linux (cross-compiled, on staging-next for now, waiting for the staging build)
    • x86_64-darwin
    • aarch64-darwin
  • Check that out, dev and lib still contain the same files (with tree)
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Between libcap 2.51 and 2.52, the CROSS_COMPILE flag appears in more places.
Maybe it was already required before, but now the build fails due to it not being set.

Set it unconditionally.
@Mindavi Mindavi added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Apr 11, 2022
@alyssais alyssais merged commit 4b80acb into NixOS:staging Apr 12, 2022
@Mindavi Mindavi deleted the libcap/cross-staging branch April 12, 2022 21:46
@Mindavi Mindavi mentioned this pull request Apr 15, 2022
13 tasks
@Madouura Madouura mentioned this pull request Apr 16, 2022
14 tasks
@Madouura Madouura mentioned this pull request Apr 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants