diff options
author | William A. Kennington III <wak@google.com> | 2020-03-20 23:04:31 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-03-30 22:55:47 +0300 |
commit | c5966303178fe5f1de050d914499f349d52534b1 (patch) | |
tree | 503c5a4b322281b4b08a73ccae6504ade8968ff3 /poky/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb | |
parent | 706226fd6218ed355c82d6ad7114c7b738e86e81 (diff) | |
download | openbmc-c5966303178fe5f1de050d914499f349d52534b1.tar.xz |
poky: meson: cherry-pick 0.52.0 -> 0.53.2
Alexander Kanavin (3):
meson: update 0.52.0 -> 0.52.1
meson: update 0.52.1 -> 0.53.0
meson: upgrade 0.53.0 -> 0.53.1
William A. Kennington III (1):
meson: upgrade 0.53.1 -> 0.53.2
Change-Id: I5617b9f3f710968e57e0c3330dc57abe3f23d1e2
Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'poky/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb')
-rw-r--r-- | poky/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb new file mode 100644 index 000000000..67add2c25 --- /dev/null +++ b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb @@ -0,0 +1,65 @@ +include meson.inc + +inherit nativesdk +inherit siteinfo + +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: +# - We can't set vars like CC, CXX, etc. yet because they will be filled in with +# real paths by meson-setup.sh when the SDK is extracted. +# - Some overrides aren't needed, since the SDK injects paths that take care of +# them. +do_install_append() { + install -d ${D}${datadir}/meson + cat >${D}${datadir}/meson/meson.cross.template <<EOF +[binaries] +c = @CC +cpp = @CXX +ar = @AR +nm = @NM +strip = @STRIP +pkgconfig = 'pkg-config' + +[properties] +needs_exe_wrapper = true +c_args = @CFLAGS +c_link_args = @LDFLAGS +cpp_args = @CPPFLAGS +cpp_link_args = @LDFLAGS + +[host_machine] +system = '${SDK_OS}' +cpu_family = '${SDK_ARCH}' +cpu = '${SDK_ARCH}' +endian = '${@meson_endian("SDK", d)}' +EOF + + install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d + install -m 0755 ${WORKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ + + # We need to wrap the real meson with a thin env setup wrapper. + mv ${D}${bindir}/meson ${D}${bindir}/meson.real + install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson +} + +RDEPENDS_${PN} += "\ + nativesdk-ninja \ + nativesdk-python3 \ + nativesdk-python3-setuptools \ + " + +FILES_${PN} += "${datadir}/meson ${SDKPATHNATIVE}" |