Skip to content

bpftrace: pull upstream fix for binutils-2.39#188261

Merged
lovesegfault merged 1 commit intoNixOS:masterfrom
trofi:bpftrace-fix-for-binutils-2.39
Aug 25, 2022
Merged

bpftrace: pull upstream fix for binutils-2.39#188261
lovesegfault merged 1 commit intoNixOS:masterfrom
trofi:bpftrace-fix-for-binutils-2.39

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Aug 25, 2022 •
edited
Loading

Without the change build fails on binutils-2.39 branch as:

jit_disasm.c:105:17: error: too few arguments to function 'init_disassemble_info'
  105 |                 init_disassemble_info(&info, stdout,
      |                 ^~~~~~~~~~~~~~~~~~~~~
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
bpftrace: pull upstream fix for binutils-2.39
6784325 
Without the change build fails on binutils-2.39 branch as:

    jit_disasm.c:105:17: error: too few arguments to function 'init_disassemble_info'
      105 |                 init_disassemble_info(&info, stdout,
          |                 ^~~~~~~~~~~~~~~~~~~~~
@trofi trofi mentioned this pull request Aug 25, 2022
Merged
13 tasks
@ofborg ofborg bot requested review from martinetd, rvl and thoughtpolice August 25, 2022 07:25
@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 25, 2022
martinetd
martinetd approved these changes Aug 25, 2022
View reviewed changes
Copy link
Member

@martinetd martinetd left a comment

Choose a reason for hiding this comment

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

right -- I saw this one pass on alpine as well; thanks!
(note bpftrace won't build with bcc 0.25.0 for other bpf-things maintainers -- and no fix proposed yet for it. I'll try to send them a PR when time allows but best not to upgrade bcc 0.25 yet until then)

@bobby285271 bobby285271 added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Aug 25, 2022
@lovesegfault lovesegfault merged commit 20c8ddc into NixOS:master Aug 25, 2022
@trofi trofi deleted the bpftrace-fix-for-binutils-2.39 branch August 25, 2022 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@rvl rvl Awaiting requested review from rvl

1 more reviewer

@martinetd martinetd martinetd approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

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. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@trofi @martinetd @lovesegfault @bobby285271