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

x265: fix cross-compilation to aarch64 #333539

Merged
merged 1 commit into from
Aug 10, 2024
Merged

x265: fix cross-compilation to aarch64 #333539

merged 1 commit into from
Aug 10, 2024

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Aug 9, 2024 •
edited
Loading

Before the change we enabled arm32 code on arm64 targets. After the change we have them separate.

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.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.

@trofi trofi mentioned this pull request Aug 9, 2024
Merged
13 tasks
@trofi
Copy link
Contributor Author

trofi commented Aug 9, 2024

Causes 10 rebuilds on x86_64linux. Is it small enough for staging-next or should I spend time splitting it out to a separate condition?

$ ./maintainers/scripts/rebuild-amount.sh HEAD^

      1 release-checks
   5545 x86_64-darwin
  10715 x86_64-linux

@trofi
x265: fix build on aarch64
c4a07c3 
Before the change we enabled arm32 code on arm64 targets.
After the change we have them separate.
@trofi
Copy link
Contributor Author

trofi commented Aug 9, 2024

Causes 10 rebuilds on x86_64linux. Is it small enough for staging-next or should I spend time splitting it out to a separate condition?

$ ./maintainers/scripts/rebuild-amount.sh HEAD^

      1 release-checks
   5545 x86_64-darwin
  10715 x86_64-linux

Made the addition cross-conditional. Should not cause rebuilds.

@trofi trofi changed the title x265: fix build on aarch64 x265: fix cross-compilation to aarch64 Aug 9, 2024
@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Aug 9, 2024
emilazy
emilazy approved these changes Aug 10, 2024
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

LGTM. Feel free to cc me on any follow‐up staging PR to clean this up too.

@emilazy emilazy merged commit 4085c54 into NixOS:staging-next Aug 10, 2024
31 of 33 checks passed
@trofi trofi deleted the x264-unbreak-arm64 branch August 10, 2024 02:21
@trofi
Copy link
Contributor Author

trofi commented Aug 14, 2024

Proposed #334550 to unify arm and arm64 under nix-level isCross.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilazy emilazy emilazy approved these changes

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@trofi @emilazy