Skip to content

linuxPackages.perf: use binutils-2.38 for linux before 5.19#188121

Merged
trofi merged 1 commit intoNixOS:masterfrom
trofi:perf-fix-for-binutils-2.39
Aug 24, 2022
Merged

linuxPackages.perf: use binutils-2.38 for linux before 5.19#188121
trofi merged 1 commit intoNixOS:masterfrom
trofi:perf-fix-for-binutils-2.39

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Aug 24, 2022 •
edited
Loading

Without the change perf build fails on binutils-2.39 due to API change:

util/annotate.c: In function 'symbol__disassemble_bpf':
util/annotate.c:1765:9: error: too few arguments to function 'init_disassemble_info'
1765 | init_disassemble_info(&info, s,
| ^~~~~~~~~~~~~~~~~~~~~

Description of changes
Things done
  • Built on platform(s)
    • x86_64-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.

@trofi
linuxPackages.perf: use binutils-2.38 for linux before 5.19
19b8b52 
Without the change perf build fails on binutils-2.39 due to API change:

util/annotate.c: In function 'symbol__disassemble_bpf':
util/annotate.c:1765:9: error: too few arguments to function 'init_disassemble_info'
 1765 |         init_disassemble_info(&info, s,
      |         ^~~~~~~~~~~~~~~~~~~~~
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Aug 24, 2022
@trofi trofi mentioned this pull request Aug 24, 2022
Merged
13 tasks
@ofborg ofborg bot requested a review from viric August 24, 2022 06:36
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Aug 24, 2022
@b12f
Copy link
Contributor

b12f commented Aug 24, 2022

Result of nixpkgs-review pr 188121 run on x86_64-linux 1

9 packages marked as broken and skipped:
  • linuxKernel.packages.hardkernel_4_14.perf
  • linuxKernel.packages.linux_4_14.perf
  • linuxKernel.packages.linux_4_14_hardened.perf
  • linuxKernel.packages.linux_4_19.perf
  • linuxKernel.packages.linux_4_19_hardened.perf
  • linuxKernel.packages.linux_4_9.perf
  • linuxPackages_4_14_hardened.perf
  • linuxPackages_4_19_hardened.perf
  • linuxPackages_hardkernel_latest.perf
16 packages built:
  • cargo-flamegraph
  • linuxPackages_5_10_hardened.perf (linuxKernel.packages.linux_5_10.perf)
  • linuxPackages.perf (linuxKernel.packages.linux_5_15.perf ,linuxPackages_5_15_hardened.perf ,linuxPackages_hardened.perf)
  • linuxPackages_5_18_hardened.perf (linuxKernel.packages.linux_5_18.perf)
  • linuxPackages_latest.perf (linuxKernel.packages.linux_5_19.perf)
  • linuxKernel.packages.linux_5_4.perf
  • linuxPackages_5_4_hardened.perf (linuxKernel.packages.linux_5_4_hardened.perf)
  • linuxPackages_latest-libre.perf (linuxKernel.packages.linux_latest_libre.perf)
  • linuxPackages-libre.perf (linuxKernel.packages.linux_libre.perf)
  • linuxPackages_lqx.perf (linuxKernel.packages.linux_lqx.perf)
  • linuxPackages_testing_bcachefs.perf (linuxKernel.packages.linux_testing_bcachefs.perf)
  • linuxPackages_xanmod.perf (linuxKernel.packages.linux_xanmod.perf)
  • linuxPackages_xanmod_latest.perf (linuxKernel.packages.linux_xanmod_latest.perf)
  • linuxPackages_xanmod_tt.perf (linuxKernel.packages.linux_xanmod_tt.perf)
  • linuxPackages_zen.perf (linuxKernel.packages.linux_zen.perf)
  • qtcreator

@trofi trofi merged commit 36ba9b7 into NixOS:master Aug 24, 2022
@trofi trofi deleted the perf-fix-for-binutils-2.39 branch August 24, 2022 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@viric viric Awaiting requested review from viric

Assignees

No one assigned

Labels

6.topic: kernel The Linux kernel 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@trofi @b12f