Skip to content

bpftools: fix build on ppc64le#198587

Merged
vcunat merged 1 commit intoNixOS:stagingfrom
jiegec:bpftools-ppc64le
Nov 10, 2022
Merged

bpftools: fix build on ppc64le#198587
vcunat merged 1 commit intoNixOS:stagingfrom
jiegec:bpftools-ppc64le

Conversation

@jiegec
Copy link
Copy Markdown
Member

@jiegec jiegec commented Oct 30, 2022

Description of changes

This pr fixes compilation of bpftools on ppc64le. Related pr: #192670. The fix is learned from https://www.spinics.net/lists/netdev/msg694314.html.

Things done
  • Built on platform(s)
    • x86_64-linux
    • powerpc64le-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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.11 Release Notes (or backporting 22.05 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.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 30, 2022
@nixos-discourse
Copy link
Copy Markdown

nixos-discourse commented Nov 9, 2022

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/1386

SuperSandro2000
SuperSandro2000 reviewed Nov 9, 2022
View reviewed changes
pkgs/os-specific/linux/bpftools/default.nix Outdated
Copy link
Copy Markdown
Member

@SuperSandro2000 SuperSandro2000 Nov 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
] ++ lib.optionals stdenv.hostPlatform.isPower64 [

lets make sure this continue to works in the future

Copy link
Copy Markdown
Member Author

@jiegec jiegec Nov 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, the patch is applied on all platforms.

Copy link
Copy Markdown
Member

@vcunat vcunat Nov 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, let's hope, after reading comments like

This is too puzzling to fix portably.

@ofborg ofborg bot requested a review from thoughtpolice November 10, 2022 00:31
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 10, 2022
@jiegec jiegec changed the base branch from master to staging November 10, 2022 00:34
@vcunat vcunat merged commit 19b704f into NixOS:staging Nov 10, 2022
@jiegec jiegec deleted the bpftools-ppc64le branch November 11, 2022 05:52
@Atemu Atemu mentioned this pull request Nov 17, 2022
Closed
10 tasks
@OPNA2608 OPNA2608 mentioned this pull request Jul 4, 2025
Merged
15 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vcunat vcunat vcunat left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jiegec @nixos-discourse @vcunat @SuperSandro2000