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

elfutils: fix header colliding with binary in llvm #331192

Merged
merged 1 commit into from
Sep 23, 2024

Conversation

RossComputerGuy
Copy link
Member

Description of changes

stack in src can collide with a header in libc++.

  CCLD     nm
  CCLD     ar
  CCLD     elfcompress
  CCLD     strip
  CCLD     unstrip
In file included from srcfiles.cxx:50:
In file included from /nix/store/649b79xp5hfmjc5a5xwq7nxw8lrwjs5y-libcxx-aarch64-unknown-linux-gnu-18.1.8-dev/include/c++/v1/iostream:44:
In file included from /nix/store/649b79xp5hfmjc5a5xwq7nxw8lrwjs5y-libcxx-aarch64-unknown-linux-gnu-18.1.8-dev/include/c++/v1/istream:170:
In file included from /nix/store/649b79xp5hfmjc5a5xwq7nxw8lrwjs5y-libcxx-aarch64-unknown-linux-gnu-18.1.8-dev/include/c++/v1/ostream:189:
In file included from /nix/store/649b79xp5hfmjc5a5xwq7nxw8lrwjs5y-libcxx-aarch64-unknown-linux-gnu-18.1.8-dev/include/c++/v1/format:195:
In file included from /nix/store/649b79xp5hfmjc5a5xwq7nxw8lrwjs5y-libcxx-aarch64-unknown-linux-gnu-18.1.8-dev/include/c++/v1/__format/container_adaptor.h:25:
./stack:1:1: error: expected unqualified-id

Patch will be upstreamed.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@RossComputerGuy
Copy link
Member Author

@ofborg build pkgsLLVM.elfutils

@RossComputerGuy
Copy link
Member Author

@ofborg eval

Copy link
Contributor

@tomberek tomberek left a comment

Choose a reason for hiding this comment

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

Allows LLVM builds to proceed past name collision with headers. no rebuilds caused. Remove patch once upstream has fix.

@tomberek tomberek merged commit e2c10d9 into NixOS:master Sep 23, 2024
26 checks passed
@RossComputerGuy RossComputerGuy deleted the fix/pkgsllvm/elfutils-again branch September 23, 2024 03:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants