meson: Correctly handle endianness for PowerPC CPU families#13520
Merged
Mic92 merged 1 commit intoNixOS:masterfrom Jul 23, 2025
Merged
meson: Correctly handle endianness for PowerPC CPU families#13520Mic92 merged 1 commit intoNixOS:masterfrom
Mic92 merged 1 commit intoNixOS:masterfrom
Conversation
I've missed this while reviewing 6db6190. I only built big endian ppc64, so that didn't occur to me. From meson manual: > Those porting from autotools should note that Meson does not add > endianness to the name of the cpu_family. For example, autotools will > call little endian PPC64 "ppc64le", Meson will not, you must also check > the .endian() value of the machine for this information. This code should handle that correctly.
xokdvium
added
backport 2.28-maintenance
Contributor
|
I think this looks fine. 32-bit POWER is not something I've looked at in Nixpkgs, so I'm unsure / not very hopeful about support for it. My POWER system is also big-endian only, so I can't check the little-endian part on hardware. MIPS and maybe some other bi-endian archs might need a similar check, but with Edit: Still gives |
Mic92
approved these changes
Jul 23, 2025
This was referenced Jul 23, 2025
mergify bot
added a commit
that referenced
this pull request
Jul 23, 2025
…3520 meson: Correctly handle endianness for PowerPC CPU families (backport #13520)
mergify bot
added a commit
that referenced
this pull request
Jul 23, 2025
…3520 meson: Correctly handle endianness for PowerPC CPU families (backport #13520)
lf-
pushed a commit
to lix-project/lix
that referenced
this pull request
Jul 29, 2025
Nixpkgs expects the `builtin.currentSystem` for POWER CPUs to be: `powerpc[64][le]-linux` But using `host_machine.cpu_family()` for the CPU part of the system string on POWER produces this instead: `ppc[64]-linux` So evaluating Nixpkgs errors out on: `error: Unknown CPU type: ppc64` To fix this, change `ppc` -> `powerpc` `ppc64` -> `powerpc64` and append `le` if `host_machine.endian() == 'little'`. I can't actually test this on hardware rn due to hitting a kernel bug on the host system when linking big things[1], but the approach here is similar to how it was fixed in cppnix[2][3], so it *should* be fine. [1] https://git.adelielinux.org/adelie/packages/-/issues/1315 [2] NixOS/nix#13514 [3] NixOS/nix#13520 Change-Id: Ib82839cdaf2198bf18b89e82caaa1217f88e11ed
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
I've missed this while reviewing 6db6190. I only built big endian ppc64, so that didn't occur to me.
From meson manual:
This code should handle that correctly.
Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.