meson: Make target-agnostic
The cross file is added in the `mkDerivation`. It isn't nice putting build tool-specific stuff here, but our current architecture gives us little alternative.
This commit is contained in:
@@ -3,20 +3,8 @@
|
||||
, stdenv
|
||||
, writeTextDir
|
||||
, substituteAll
|
||||
, targetPackages
|
||||
}:
|
||||
|
||||
let
|
||||
# See https://mesonbuild.com/Reference-tables.html#cpu-families
|
||||
cpuFamilies = {
|
||||
aarch64 = "aarch64";
|
||||
armv5tel = "arm";
|
||||
armv6l = "arm";
|
||||
armv7l = "arm";
|
||||
i686 = "x86";
|
||||
x86_64 = "x86_64";
|
||||
};
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "meson";
|
||||
version = "0.54.0";
|
||||
@@ -70,27 +58,11 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
crossFile = writeTextDir "cross-file.conf" ''
|
||||
[binaries]
|
||||
pkgconfig = 'pkg-config'
|
||||
|
||||
[properties]
|
||||
needs_exe_wrapper = true
|
||||
|
||||
[host_machine]
|
||||
system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}'
|
||||
cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}'
|
||||
cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}'
|
||||
endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
|
||||
'';
|
||||
|
||||
# 0.45 update enabled tests but they are failing
|
||||
doCheck = false;
|
||||
# checkInputs = [ ninja pkgconfig ];
|
||||
# checkPhase = "python ./run_project_tests.py";
|
||||
|
||||
isCross = stdenv.targetPlatform != stdenv.hostPlatform;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mesonbuild.com";
|
||||
description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
|
||||
|
||||
@@ -5,11 +5,6 @@ mesonConfigurePhase() {
|
||||
mesonFlags="--prefix=$prefix $mesonFlags"
|
||||
fi
|
||||
|
||||
# Build release by default.
|
||||
if [ -n "@isCross@" ]; then
|
||||
crossMesonFlags="--cross-file=@crossFile@/cross-file.conf"
|
||||
fi
|
||||
|
||||
# See multiple-outputs.sh and meson’s coredata.py
|
||||
mesonFlags="\
|
||||
--libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \
|
||||
|
||||
Reference in New Issue
Block a user