Skip to content

ucx: pull upstream fix for binutils-2.39#188258

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

ucx: pull upstream fix for binutils-2.39#188258
trofi merged 1 commit intoNixOS:masterfrom
trofi:ucx-fix-for-binutils-2.39

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Aug 25, 2022 •
edited
Loading

binutils-2.39 dropped #define PTR void* compaibility macro.

Without this change build fails as:

debug/debug.c: In function 'load_file':
debug/debug.c:275:53: error: 'PTR' undeclared (first use in this function)
  275 |     symcount = bfd_read_minisymbols(file->abfd, 0, (PTR)&file->syms, &size);
      |                                                     ^~~
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
ucx: pull upstream fix for binutils-2.39
590822e 
`binutils-2.39` dropped `#define PTR void*` compaibility macro.

Without this change build fails as:

    debug/debug.c: In function 'load_file':
    debug/debug.c:275:53: error: 'PTR' undeclared (first use in this function)
      275 |     symcount = bfd_read_minisymbols(file->abfd, 0, (PTR)&file->syms, &size);
          |                                                     ^~~
@trofi trofi mentioned this pull request Aug 25, 2022
Merged
13 tasks
@ofborg ofborg bot requested a review from markuskowa August 25, 2022 07:22
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Aug 25, 2022
@markuskowa
Copy link
Member

markuskowa commented Aug 25, 2022

@GrahamcOfBorg test slurm

@trofi trofi merged commit ada79f0 into NixOS:master Aug 25, 2022
@trofi trofi deleted the ucx-fix-for-binutils-2.39 branch August 25, 2022 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@markuskowa markuskowa markuskowa approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@trofi @markuskowa