linux/poky.git/meta/recipes-devtools/meson, branch kirkstone

meson: Fix wrapper handling of implicit setup command

2023-03-20T17:20:44+00:00

From an SDK, running a meson setup build without an explicit setup command can result in a native build when a cross build is expected. The problem is in meson-wrapper where it tries to detect whether a setup command is being used. The logic looks through all arguments for a command, and the first argument it finds that doesn't start with a - is treated as the command. This doesn't work for an implicit setup command if any option with a space-separated argument exists. In this case, the argument is incorrectly selected as the command, causing the setup command options for the cross build to be excluded from the command line, and thus a native build. Improve the logic by just looking at the first argument. If it is a known comand, then record it. Otherwise just assume it is the implicit setup command. Note that this fix does not address the possibility of a new meson command. Two new echo statements are included to help the user in case of trouble: ``` ~/git/weston-imx$ meson --warnlevel 3 --prefix=/usr -Ddoc=false -Dbackend-drm-screencast-vaapi=false -Dcolor-management-lcms=false -Dpipewire=false -Dbackend-x11=false -Dxwayland=true -Dsimple-clients=all -Dbackend-wayland=false -Dbackend-default=drm -Dbackend-rdp=false -Dtest-junit-xml=false -Dlauncher-libseat=false -Dimage-jpeg=false -Dimage-webp=false -Drenderer-g2d=true build meson-wrapper: Implicit setup command assumed meson-wrapper: Running meson with setup options: " --cross-file=/opt/fsl-imx-internal-xwayland/6.1-langdale/sysroots/x86_64-pokysdk-linux/usr/share/meson/aarch64-poky-linux-meson.cross --native-file=/opt/fsl-imx-internal-xwayland/6.1-langdale/sysroots/x86_64-pokysdk-linux/usr/share/meson/meson.native " The Meson build system Version: 0.63.3 ``` (From OE-Core rev: 1f30dedee80669475557d9de5f130b7a23eaa7ec) Signed-off-by: Tom Hochstein Signed-off-by: Alexandre Belloni (cherry picked from commit 9338bd66a3c9ab5cb781f2ee588306c5b31a3cb5) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

meson: make wrapper options sub-command specific

2022-11-09T17:42:08+00:00

The meson-wrapper adds setup options to facilitate cross-compilation. The current options are exclusive to the setup sub-command and might cause issues with other sub-commands. Update the wrapper to make options sub-command specific. (From OE-Core rev: 6f4764ae2ef06c54dbbf77bcbf07af9390a565c9) Signed-off-by: Liam Beguin Signed-off-by: Alexandre Belloni (cherry picked from commit 7bcda141f2019862b4fb5d8dec7956cd8344b420) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

meson: Robustify compiler detection logic

2022-04-01T22:11:38+00:00

meson would fail to detect compiler type in some rare care where specific substring '-xt' is detected in compiler --version output and it so happens that this string can be generated by clang --version if clang is installed into a directory containing 'xt-' in its name. with recipe specific sysroots, this is quite likely to happen in OE build system as we are seeing the issue with newly proposed gnome-text-editor recipe https://lists.openembedded.org/g/openembedded-devel/topic/90150031#96301 (From OE-Core rev: ff75909f2a9e970aaf389e0012888c29f02376e3) Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie

classes/setuptools_build_meta: rename to python_setuptools_build_meta

2022-03-20T00:02:22+00:00

Rename this class to be python-prefixed to match the other new Python build system classes. (From OE-Core rev: 25d6bf8079797906bde7c0cf63a0466c981ba5bb) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

meson: upgrade 0.61.2 -> 0.61.3

2022-03-20T00:02:22+00:00

(From OE-Core rev: e072a9b7cdd937b8976e87f1da1323859bb37c72) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie

meta: remove obsolete PIP_INSTALL_PACKAGE

2022-03-12T09:20:03+00:00

PIP_INSTALL_PACKAGE isn't used anymore, so remove all instances of it from the recipes. (From OE-Core rev: 15baf24f750ab2c8b0a46d4a3bf2ae9bfa3d0aff) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

meson: inherit setuptools_build_meta

2022-02-25T15:07:50+00:00

Upstream provides a pyproject.toml which declares setuptools.build_meta to be backend for PEP-517 packaging. Set PIP_INSTALL_PACKAGE as this recipe does not inherit pypi and therefor no PYPI_PACKAGE is defined [YOCTO #14638] (From OE-Core rev: 0d9bc65139a9cabbeabe166e83f2d61f47d7bdd7) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie

meson: upgrade 0.61.1 -> 0.61.2

2022-02-18T11:37:11+00:00

(From OE-Core rev: 572e68905b6864e64d14c606b2b31b59e5e9cca1) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie

meson: update 0.60.3 -> 0.61.1

2022-01-20T11:57:28+00:00

Backport patches to epiphany/gcr/g-i to address failures with new meson. (From OE-Core rev: 2ab302edc33681f94b2cd85b564f6feebe154392) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie

meson: fold nativesdk into the main recipe

2022-01-20T11:57:28+00:00

This allows automated version updates when possible, and reduces friction in manual ones. (From OE-Core rev: 54d4a767ab7beaa64cfc4c221317ea03b0b119ab) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie