public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: fix cpu_family for aarch64

Browse Source 
As documented, it should be `aarch64` for AArch64.

 * https://mesonbuild.com/Reference-tables.html#cpu-families

```
 $ nix eval '((import <nixpkgs> {}).pkgsCross.aarch64-multiplatform.stdenv.targetPlatform.parsed.cpu.family)'
"arm"
```

The lookup table will ensure that, at any point, meson does not pick the
wrong family.
This commit is contained in:
Samuel Dionne-Riel 2019-05-21 21:00:34 -04:00
parent 8abe5ee07e
commit 858076ef56
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -1,5 +1,15 @@
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
let
# See https://mesonbuild.com/Reference-tables.html#cpu-families
cpuFamilies = {
"aarch64" = "aarch64";
"armv6l" = "arm";
"armv7l" = "arm";
"i686" = "x86";
"x86_64" = "x86_64";
};
in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
version = "0.49.2"; version = "0.49.2";
pname = "meson"; pname = "meson";
@ -68,7 +78,7 @@ python3Packages.buildPythonApplication rec {
[host_machine] [host_machine]
system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}' system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}'
cpu_family = '${targetPackages.stdenv.targetPlatform.parsed.cpu.family}' cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}'
cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}' cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}'
endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
''; '';