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.

Sign up for GitHub

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

Jump to bottom

darwin/make-bootstrap-tools.nix: set -headerpad_max_install_names for… #273843

Merged
merged 1 commit into from
Dec 13, 2023
Merged

darwin/make-bootstrap-tools.nix: set -headerpad_max_install_names for… #273843

merged 1 commit into from
Dec 13, 2023

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Dec 12, 2023 •
edited by vcunat
Loading

… coreutils

Without the change bootstrapTools build fails as:
https://cache.nixos.org/log/g5wyq9xqshan6m3kl21bjn1z88hx48rh-stdenv-bootstrap-tools.drv

error: install_name_tool: changing install names or rpaths can't be redone for: /nix/store/0hxg356h7lnl2hck23wrdpbib3cckx41-stdenv-bootstrap-tools/bin/tac (for architecture x86_64) because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)

Description of changes

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Dec 12, 2023
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 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 Dec 12, 2023
@vcunat vcunat changed the base branch from staging-next to master December 13, 2023 06:31
@vcunat vcunat added the 1.severity: channel blocker Blocks a channel label Dec 13, 2023
@vcunat
Copy link
Member

vcunat commented Dec 13, 2023

Nit: built on x86_64-linux? I don't know what that means here.

@vcunat vcunat mentioned this pull request Dec 13, 2023
Merged
vcunat
vcunat approved these changes Dec 13, 2023
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Looks fine, and I confirm this fixing the build for x86_64-darwin.

@trofi
Copy link
Contributor Author

trofi commented Dec 13, 2023

Nit: built on x86_64-linux? I don't know what that means here.

Oh, should have been x86_64-darwin. Unticked the box.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 13, 2023
shyim
shyim approved these changes Dec 13, 2023
View reviewed changes
Copy link
Member

@shyim shyim left a comment

Choose a reason for hiding this comment

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

Tested localy works fine aarch64

@delroth delroth added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Dec 13, 2023
@trofi
darwin/make-bootstrap-tools.nix: set -headerpad_max_install_names for…
fccb480 
… coreutils

Without the change bootstrapTools build fails as:
https://cache.nixos.org/log/g5wyq9xqshan6m3kl21bjn1z88hx48rh-stdenv-bootstrap-tools.drv

    error: install_name_tool: changing install names or rpaths can't be redone for: /nix/store/0hxg356h7lnl2hck23wrdpbib3cckx41-stdenv-bootstrap-tools/bin/tac (for architecture x86_64) because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
@trofi
Copy link
Contributor Author

trofi commented Dec 13, 2023

Rebased against master.

@delroth delroth removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Dec 13, 2023
@vcunat vcunat merged commit c15b581 into NixOS:master Dec 13, 2023
4 checks passed
@trofi trofi deleted the darwin-coreutils branch December 13, 2023 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shyim shyim shyim approved these changes

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
1.severity: channel blocker Blocks a channel 6.topic: darwin Running or building packages on Darwin 6.topic: stdenv Standard environment 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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@trofi @vcunat @shyim @delroth