None of the backported patches actually made it into this release.
(From OE-Core rev: a443a765944797b2a62935fc7ea3a2dd827e3b1a)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The prefix should be correct in the first place, and substitution breaks
with our custom patched Python.
(From OE-Core rev: ad1d0187aed457e4b5bd1c0d11b39141786bc9fd)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove 0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
as the upstream code has been completely reworked; if the issues pops up
again, we need to re-write the fix.
Rebase:
0001-Make-CPU-family-warnings-fatal.patch
0001-environment.py-detect-windows-also-if-the-system-str.patch
0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
0002-Support-building-allarch-recipes-again.patch
Add 0001-mesonbuild-environment.py-check-environment-for-vari.patch
as particularly we set windows resource compiler through an
environment variable WINDRES. This has replaced the
0001-modules-windows-split-WINDRES-env-variable.patch as the code
has been refactored.
Add 0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
for a more robust detection of cross builds.
Replace many-cross.patch with corresponding backports from upcoming 0.50.1:
0007-mesonbuild-allow-multiple-cross-file-options.patch
load-configs-generalise-search-path.patch
Drop cross-libdir.patch as it has been merged upstream.
(From OE-Core rev: 3f9a0f0c6c99364eb128ffc2db704e957f1c0bce)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For historical reasons Meson supports only a single cross configuration file but
multiple native configuration files. Add support for multiple cross files, so
that recipes such as glib can use the toolchain cross file and extend it with a
recipe-specific cross file containing values needed to build.
(From OE-Core rev: 3d97cddeec8635988e414e6854d850cea20bcb36)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Projects such as glib have tests that execute code to check their behaviour, and
in cross-compilation environments where they can't execute code fall back on
meson.get_cross_property() with a default value. These default values may not
be appropriate: for example if glib can't verify that vsprintf() isn't broken it
assumes that it is, and embeds the gnulib copy of vsprintf() instead of using
glibc's implementation.
Add a warning whenever the default value for get_cross_property() is used so
that we can tell this is happening and set the value appropriately.
(From OE-Core rev: 669ddafcc9f363cbb81d4b71649241257785a840)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Meson doesn't ignore this but will emit a warning, so write the correct value.
(From OE-Core rev: 1239157805a4c363da853de6db05c53083b01189)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Multilib SDKs differ only in the environment variables set, so nativesdk-meson's
setup script needs to write a cross file for each environment.
Rename the shipped meson.cross to meson.cross.template, as it cannot be used
directly. Now that post-relocate scripts are called once for each environment,
the generated meson.cross can be prefixed with TARGET_PREFIX to ensure it is
unique.
Finally rewrite the setup script to use string.Template to perform the expansion
instead of hand-coding the logic.
(From OE-Core rev: 8596f871ef834a38e3375443f7eb08e43816347a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If --libdir isn't passed to Meson a default is used, but as this default value
changes depending on the host (whether it is Debian-like, or has /usr/lib64)
this isn't appropriate for cross builds.
(From OE-Core rev: fdb5a8b3d437537aee53380091dabe6258667a49)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Meson uses pkg_resources, which is part of setuptools.
(From OE-Core rev: 30a9dbc8a13928541ce6ff270801b8fd1c8af37e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop upstreamed gi-flags.patch and gtkdoc-flags.patch, rebase the rest.
(From OE-Core rev: 6cc5c57c38d2da37b4f15dea6e1fb97e3a0bae73)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The value to SRC_URI_append_class-native was not prefixed with a space.
This was not noticed as the SRC_URI before applying the _append contains
trailing spaces. However, if one, e.g., has a .bbappend and adds to the
SRC_URI using SRC_URI += "file://foo.patch", then there no longer is any
trailing space and the _append concatenates the two URIs together,
leading to a build failue.
(From OE-Core rev: c07ee11e99dfe28405a7225903a541b33aeb1de6)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As discussed in https://github.com/mesonbuild/meson/issues/2567 there
needs to be a way to allow our rpath options passed to the linker to be
preserved, else we run into weird build failures.
(e.g. libmodulemd-native used by libdnf can't find libyaml)
Disable this for now until upstream come up with a better way of handling
this.
(From OE-Core rev: b4e36281631e0b59d1058f5cf391eb8b15e605cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meson does it in a way that breaks oe builds (they export a bunch of PKG_CONFIG_ variables)
(From OE-Core rev: f071c5eb0a46b8ac5424c5baeb471a8080d4a078)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These two patches are only relevant for builds inside OpenEmbedded, so make them
native-specific.
(From OE-Core rev: 63c89efde45b4aef873e2086b201cad538e42044)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove the previous attempt at this from
0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch as it wasn't quite
right, and the rest of the patch is adding the currently not upstreamable runner
option.
Add two new patches to fix both gobject-introspection and gtk-doc using native
flags for target compiles.
(From OE-Core rev: bf41247f52ffd40d91d94d1fc983f8a831b80e48)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of one patch to change a warning into an exception and another to change
the message, squash the patches together as neither of the are acceptable
upstream.
(From OE-Core rev: d9e5308ebfe376814f383d61ed00b50e8bad526b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop backported patches, refresh the rest.
(From OE-Core rev: 6c09949663a02015dc8a7b80f581e4867afdd7e3)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This makes it more suitable to work with, e.g., devtool. It also
prepares for the update to 0.47.0 when the first patch will no longer be
needed (as it is a backport).
(From OE-Core rev: e1297f9a951b1dbafd0e211be63b348f06b1f3cd)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If a CPU family isn't recognised the first step should be to verify the mapping.
Send the user to a wiki page explaining what to do, instead of directly to the
Meson bug tracker.
(From OE-Core rev: 6c1e880a2bf4799cf451ff20c7ab93c55a755751)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Meson has a defined list of known CPU families but these are not currently
validated, so mistakes in cross files or new architectures are not noticed.
Backport a patch from upstream which warns on unknown architectures, but tweak
it to fatally error instead. When we upgrade to Meson 0.47 the first half of
this patch can be dropped.
(From OE-Core rev: be194a459944dfcc41bae7315643a5d284683efc)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently, we can't build meson into SDKs because we don't autogenerate
the required meson.cross file.
Enable this by using the post-relocate hooks and generating a
meson.cross file based on the SDK environment passed into the
post-relocate hook.
(From OE-Core rev: aabb846b165fec218024a7a57f3c9fdaa2514179)
Signed-off-by: Martin Kelly <mkelly@xevo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add patches to enable meson to handle being wrapped with a shell script. This
will enable us to do so for supporting the SDK, which requires us to setup env
vars and point to a meson.cross file inside the SDK.
These patches are all merged upstream, so we can drop them soon.
(From OE-Core rev: f80567874c8c30e43d39599dd73dd4a67eff8103)
Signed-off-by: Martin Kelly <mkelly@xevo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
