diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-13 22:56:18 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-14 07:57:21 +0100 |
| commit | cb2a7dcc86d784cb9903f69570ddc05e23d36529 (patch) | |
| tree | 5dd728cdac3c0d67c7d5e3b9f44aa0be51f023ea /meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb | |
| parent | 4e509099d1a8c22e5f592e6675dabacfe910b9b9 (diff) | |
| download | openembedded-core-cb2a7dcc86d784cb9903f69570ddc05e23d36529.tar.gz | |
meson: update 0.57.2 -> 0.58.0
Rebase patches; dropped chunks (and cross-prop-default.patch)
have been removed upstream.
Move native-only patches to all-patches, as they're a pain to rebase
separately.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb')
| -rw-r--r-- | meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb deleted file mode 100644 index 8778cab124..0000000000 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb +++ /dev/null @@ -1,66 +0,0 @@ -include meson.inc - -inherit siteinfo -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: -# - 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 -sys_root = @OECORE_TARGET_SYSROOT - -[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}" |