diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-13 22:56:20 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-14 07:57:21 +0100 |
| commit | b6257f3b88e788af3ee748a8a6366aab819dce3f (patch) | |
| tree | 5d8ec58b90f7b70a0f567c4653c70c426aa73e80 /meta | |
| parent | fe6889ed05edf2f1e4ac7b06debd4cc43ebb9607 (diff) | |
| download | openembedded-core-b6257f3b88e788af3ee748a8a6366aab819dce3f.tar.gz | |
nativesdk-meson: correctly set cpu_family
This was a warning before, but with the patch
that turns it into an error, it needs to be properly addressed.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb index 8778cab124..74e1a7104a 100644 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb @@ -1,21 +1,11 @@ include meson.inc -inherit siteinfo +inherit meson-routines inherit nativesdk SRC_URI += "file://meson-setup.py \ file://meson-wrapper" -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) - # The cross file logic is similar but not identical to that in meson.bbclass, # since it's generating for an SDK rather than a cross-compile. Important # differences are: @@ -44,7 +34,7 @@ sys_root = @OECORE_TARGET_SYSROOT [host_machine] system = '${SDK_OS}' -cpu_family = '${SDK_ARCH}' +cpu_family = '${@meson_cpu_family("SDK_ARCH", d)}' cpu = '${SDK_ARCH}' endian = '${@meson_endian("SDK", d)}' EOF |