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

patchelf: if targetPlatform.isMips: apply patchelf/pull/380 #178207

Merged
merged 1 commit into from Jun 29, 2022
Merged

patchelf: if targetPlatform.isMips: apply patchelf/pull/380 #178207

merged 1 commit into from Jun 29, 2022

Conversation

ghost
Copy link

@ghost ghost commented Jun 19, 2022

(draftified until patchelf/pull/380 merges into patchelf)

Description of changes

This PR applies the patches which fix a MIPS-specific bug in patchelf. The patches are applied only if targetPlatform.isMips in order to:

  1. Not cause a mass-rebuild on the mainstream platforms

  2. Make this PR acceptable for inclusion in master rather than staging.

This is the very last commit needed in order for Hydra to be able to produce a useful bootstrap-files tarball for mips64el (the other one is in staging-next).

This PR can be reverted after the next release of patchelf lands in nixpkgs.

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.

This PR applies the patches which fix a MIPS-specific bug in patchelf.
The patches are applied only if targetPlatform.isMips in order to:

1. Not cause a mass-rebuild on the mainstream platforms

2. Make this PR acceptable for inclusion in `master` rather than
   `staging`.

This is the very last commit needed in order for Hydra to be able to
produce a bootstrap-files tarball for mips64el (the other one is in
`staging-next`).

This PR can be reverted after the next release of patchelf lands in
nixpkgs.
@ghost ghost marked this pull request as ready for review June 20, 2022 10:19
Copy link
Contributor

@Mindavi Mindavi left a comment

Choose a reason for hiding this comment

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

LGTM, but that patch hasn't been merged yet, right? Maybe we should wait a bit.

NixOS/patchelf#380

@ghost ghost marked this pull request as draft June 21, 2022 21:17
@ghost
Copy link
Author

ghost commented Jun 21, 2022

LGTM, but that patch hasn't been merged yet, right? Maybe we should wait a bit.

Sorry, somehow I thought it had been. My mistake.

@ghost ghost marked this pull request as ready for review June 29, 2022 19:18
@ghost
Copy link
Author

ghost commented Jun 29, 2022

NixOS/patchelf#380 has merged into patchelf.

Also, Hydra builds of the mips64el bootstrap-files succeeded for the first time on 2022-Jun-19. So if we can just get that build to include this patch I think we will finally be able to post it to tarballs.nixos.org.

@Mindavi Mindavi merged commit caf02e1 into NixOS:master Jun 29, 2022
@ghost ghost deleted the pr/patchelf/apply_pr_380 branch June 29, 2022 21:49
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