summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson.inc
Commit message (Collapse)AuthorAgeFilesLines
* meson: fix cross detectionRoss Burton2019-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Meson 0.51 onwards detects if a build is cross by whether the host and build machines match. However this doesn't work in a number of cross compilation cases: notably where host is Windows but build is Linux, but also the common OpenEmbedded case where the host and build machine are both x86-64. Previously we'd patched this to instead look at whether an executable wrapper is needed: our cross files always set this to true so all cross builds would be identified as cross. However, this breaks build on the target as without a cross file the early cross build detection fails as we don't yet know if an exe wrapper is needed. The neater solution is to simply go back to the older logic: a cross build has cross files defined. [ YOCTO #13571 ] (From OE-Core rev: 9aa543aa9bd78c63343ae28fc85113ca2c9e0094) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: fix RDEPENDSRoss Burton2019-10-081-1/+1
| | | | | | | | | | | Meson needs python3-pkg-resources to work to add to RDEPENDS. Remove python3-core as this is automatically pulled in by python3-modules. (From OE-Core rev: d253b061fbe45ae965af71008e9a6c6fe5037cd3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: add missing some description in devtoolsMaxime Roussin-Bélanger2019-10-081-0/+3
| | | | | | | (From OE-Core rev: 57075f3dede7ad25163deaf6686221dbe1b5ad02) Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson:upgrade 0.51.1 -> 0.51.2Zang Ruochen2019-09-061-3/+2
| | | | | | | | | | | -meson/0001-Fix-missing-return-statements-that-are-seen-with-Wer.patch Removed since this is included in 0.51.2. (From OE-Core rev: 62ea5c31be4a1a5eaba83f81d09b36553febb647) Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: backport fix for builds with -Werror=return-typeMartin Jansa2019-08-141-0/+1
| | | | | | | (From OE-Core rev: de623085039111d9988918ae95e07e48108a9ff1) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: add a backported patch to address vala cross-compilation errorsAlexander Kanavin2019-08-031-0/+1
| | | | | | | (From OE-Core rev: c8ac42f5110c9b8e4f2c275332651df152013c0a) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: update 0.50.1 -> 0.51.1Alexander Kanavin2019-08-031-4/+2
| | | | | | | | | | | Drop backports. Rebase other patches. (From OE-Core rev: 3251ce439ea164fcf230dcede06da1a05b5c6775) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: update to 0.50.1Alexander Kanavin2019-05-091-2/+2
| | | | | | | | | 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>
* meson: do not try to substitute the prefix in python supplied pathsAlexander Kanavin2019-04-231-0/+1
| | | | | | | | | | 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>
* meson: update to 0.50.0Alexander Kanavin2019-04-161-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* meson: support multiple cross configuration filesRoss Burton2019-03-241-1/+2
| | | | | | | | | | | | 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>
* meson: warn if the default value from meson.get_cross_property() is being usedRoss Burton2019-03-241-0/+1
| | | | | | | | | | | | | | | | | 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: upgrade 0.49.0 -> 0.49.2Alexander Kanavin2019-02-201-2/+2
| | | | | | | (From OE-Core rev: 0cc5265d108fd632db9dd751454325fe6e86a62f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: add a couple of patches to help with mingw buildsAlexander Kanavin2019-02-191-0/+2
| | | | | | | (From OE-Core rev: ee32c312d01f4abfca2d2587d7a3a7e0115f779c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: use a sensible default for libdir when cross-compilingRoss Burton2019-01-081-0/+1
| | | | | | | | | | | 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: update to 0.49.0Alexander Kanavin2019-01-031-6/+4
| | | | | | | | | 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>
* meson: Correct use of the _append operatorPeter Kjellerstedt2018-12-031-3/+4
| | | | | | | | | | | | | | 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>
* meson: Disable rpath stripping at install timeRichard Purdie2018-11-231-0/+1
| | | | | | | | | | | | | | | 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: do not manipulate the environment when looking for python via pkg-configAlexander Kanavin2018-11-201-0/+1
| | | | | | | | | 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>
* meson: make native-specific patches native-specificRoss Burton2018-09-251-2/+4
| | | | | | | | | | 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>
* meson: respect target/native flag distinction in G-I and gtk-docRoss Burton2018-09-251-0/+2
| | | | | | | | | | | | | | | 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>
* meson: squash the architecture warning patches togetherRoss Burton2018-09-251-1/+0
| | | | | | | | | | | 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>
* meson: update to 0.47.2Alexander Kanavin2018-09-101-6/+4
| | | | | | | | | 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>
* meson: Support building allarch recipes againPeter Kjellerstedt2018-08-151-0/+1
| | | | | | | | | This registers "allarch" as a known CPU family. (From OE-Core rev: f12b64e9332e3988953f87d8cea39ca309be5046) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: Split validate-cpu.patch in threePeter Kjellerstedt2018-08-151-1/+3
| | | | | | | | | | | 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>
* meson: Add risc-v to known architecturesKhem Raj2018-08-071-0/+1
| | | | | | | (From OE-Core rev: 65e0b318b8521c3213249693cc898374effcf531) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: validate cpu_familyRoss Burton2018-07-051-0/+1
| | | | | | | | | | | | | | 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>
* meson: enable nativesdkMartin Kelly2018-06-071-0/+22
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>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 19:40:17 +0000