mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
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. (From OE-Core rev: b6257f3b88e788af3ee748a8a6366aab819dce3f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
74fbe5578a
commit
436662bc4d
@@ -1,21 +1,11 @@
|
|||||||
include meson.inc
|
include meson.inc
|
||||||
|
|
||||||
inherit siteinfo
|
inherit meson-routines
|
||||||
inherit nativesdk
|
inherit nativesdk
|
||||||
|
|
||||||
SRC_URI += "file://meson-setup.py \
|
SRC_URI += "file://meson-setup.py \
|
||||||
file://meson-wrapper"
|
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,
|
# 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
|
# since it's generating for an SDK rather than a cross-compile. Important
|
||||||
# differences are:
|
# differences are:
|
||||||
@@ -44,7 +34,7 @@ sys_root = @OECORE_TARGET_SYSROOT
|
|||||||
|
|
||||||
[host_machine]
|
[host_machine]
|
||||||
system = '${SDK_OS}'
|
system = '${SDK_OS}'
|
||||||
cpu_family = '${SDK_ARCH}'
|
cpu_family = '${@meson_cpu_family("SDK_ARCH", d)}'
|
||||||
cpu = '${SDK_ARCH}'
|
cpu = '${SDK_ARCH}'
|
||||||
endian = '${@meson_endian("SDK", d)}'
|
endian = '${@meson_endian("SDK", d)}'
|
||||||
EOF
|
EOF
|
||||||
|
|||||||
Reference in New Issue
Block a user