On Wed, 12 May 2021 at 13:26, Lee, Chee Yang <chee.yang.lee@intel.com> wrote:<= br>

Looks like this = patch failed buildepoxy.EpoxyTest.test_epoxy test

https://au= tobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/= stdio
https://au= tobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/= stdio

>-----Original Message-----
>From: openembedded-core@lists.openembedded.org <openembedded-=
>core@l= ists.openembedded.org> On Behalf Of Alexander Kanavin
>Sent: Monday, 10 May, 2021 9:01 PM
>To: openembedded-core@lists.openembedded.org
>Cc: Alexander Kanavin <alex.kanavin@gmail.com>
>Subject: [OE-core] [PATCH 7/8] 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 rebas= e
>separately.
>
>Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>---
> meta/recipes-devtools/meson/meson.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 10 +---
> .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++---=C2=A0 ...sue= s-that-arise-
>when-cross-compiling.patch |=C2=A0 8 +--=C2=A0 ...-not-manipulate-the-e= nvironment-
>when.patch | 14 ++---=C2=A0 ...pport-building-allarch-recipes-again.pat= ch | 10 ++--
> .../meson/meson/0003-native_bindir.patch=C2=A0 =C2=A0 =C2=A0 | 58 ++++= +--------------
> .../meson/meson/cross-prop-default.patch=C2=A0 =C2=A0 =C2=A0 | 23 ----= ----
> .../{meson_0.57.2.bb =3D> meson_0.58.0.bb}=C2=A0 =C2=A0 =C2=A0 = |=C2=A0 0
> ...on_0.57.2.bb =3D> nativesdk-meson_0.58.0.bb} |=C2=A0 0<= br> > 9 files changed, 43 insertions(+), 98 deletions(-)=C2=A0 delete mode 1= 00644
>meta/recipes-devtools/meson/meson/cross-prop-default.patch
> rename meta/recipes-devtools/meson/{meson_0.57.2.bb =3D>
>meson_0.58.0.bb} (100%)=C2=A0 rename meta/recipes-devtools/meson/{nati= vesdk-
>meson_0.57.2.bb =3D> nativesdk-meson_0.58.0.bb} (100%) >
>diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
>devtools/meson/meson.inc
>index 10e7d8a1ce..12a48fc992 100644
>--- a/meta/recipes-devtools/meson/meson.inc
>+++ b/meta/recipes-devtools/meson/meson.inc
>@@ -12,16 +12,12 @@ SRC_URI =3D
>"https://github.com/m= esonbuild/meson/releases/download/${PV}/meson-
>${P
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0003-native_bindir.pat= ch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0001-python-module-do-= not-manipulate-the-environment-
>when.patch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://disable-rpath-handling= .patch \
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://cross-prop-default.pat= ch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0001-modules-python.py= -do-not-substitute-python-s-
>install.patch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://gi-target-dep.patch \<= br> >+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-Make-CPU-family-w= arnings-fatal.patch \
>+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0002-Support-building-= allarch-recipes-again.patch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "
>-SRC_URI[sha256sum] =3D
>"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5&= quot;
>-
>-SRC_URI_append_class-native =3D " \
>-=C2=A0 =C2=A0 file://0001-Make-CPU-family-warnings-fatal.patch \
>-=C2=A0 =C2=A0 file://0002-Support-building-allarch-recipes-again.patch= \
>-"
>+SRC_URI[sha256sum] =3D
>"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd&= quot;
>
> UPSTREAM_CHECK_URI =3D "https://github.com/mes= onbuild/meson/releases"
> UPSTREAM_CHECK_REGEX =3D "meson-(?P<pver>\d+(\.\d+)+)\.tar&= quot;
>diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- >warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-
>CPU-family-warnings-fatal.patch
>index 300797f9ee..bcccfabd17 100644
>--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
>warnings-fatal.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
>warnings-fa
>+++ tal.patch
>@@ -1,34 +1,33 @@
>-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00
>2001
>+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00
>2001
> From: Ross Burton <ross.burton@intel.com>
> Date: Tue, 3 Jul 2018 13:59:09 +0100
>-Subject: [PATCH] Make CPU family warnings fatal
>+Subject: [PATCH 1/2] Make CPU family warnings fatal
>
> Upstream-Status: Inappropriate [OE specific]
> Signed-off-by: Ross Burton <ross.burton@intel.com>
>-
> ---
>=C2=A0 mesonbuild/envconfig.py=C2=A0 =C2=A0| 2 +-
>=C2=A0 mesonbuild/environment.py | 4 +---
>=C2=A0 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index<= br> >ba35d16..2d3c34c 100644
>+index c6a4df3..4d58c91 100644
> --- a/mesonbuild/envconfig.py
> +++ b/mesonbuild/envconfig.py
>-@@ -262,7 +262,7 @@ class MachineInfo:
>+@@ -266,7 +266,7 @@ class MachineInfo:
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cpu_family =3D literal['cpu_fami= ly']
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if cpu_family not in known_cpu_famil= ies:
>--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mlog.warning('Unknown C= PU family {}, please report this at
>https://github.com/mesonbu= ild/meson/issues/new'.format(cpu_family))
>+-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mlog.warning(f'Unknown = CPU family {cpu_family}, please report this
>at https://github.com/mesonbuild/meson/issues/new<= /a>')
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 raise EnvironmentException(= 'Unknown CPU family {}, see
>https://wiki.yoctoproject.org/wiki/Meson/Unkn= ownCPU for
>directions.'.format(cpu_family))
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 endian =3D literal['endian']=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if endian not in ('little', = 'big'):
> diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py - >index 756dd81..4d2c2b6 100644
>+index fc9b703..eea8345 100644
> --- a/mesonbuild/environment.py
> +++ b/mesonbuild/environment.py
>-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) -&= gt;
>str:
>+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -&= gt;
>str:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 trial =3D 'ppc64&#= 39;
>
>=C2=A0 =C2=A0 =C2=A0 if trial not in known_cpu_families:
>@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
>
>=C2=A0 =C2=A0 =C2=A0 return trial
>
>+--
>+2.24.0
>+
>diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-<= br> >that-arise-when-cross-compiling.patch b/meta/recipes-
>devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-
>compiling.patch
>index 471f1500da..ce90e515da 100644
>--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that- >arise-when-cross-compiling.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-ari= s
>+++ e-when-cross-compiling.patch
>@@ -1,4 +1,4 @@
>-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001=
>+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00
>2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Fri, 4 Aug 2017 16:16:41 +0300
> Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@= -
>20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >=C2=A0 1 file changed, 4 insertions(+)
>
> diff --git a/mesonbuild/modules/gnome.py
>b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644
>+index dc2979e..c9ff9bd 100644
> --- a/mesonbuild/modules/gnome.py
> +++ b/mesonbuild/modules/gnome.py
>-@@ -974,6 +974,10 @@ This will become a hard error in the future.'= '')
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0args.append('--{}= =3D{}'.format(program_name, path))
>+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
>+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0args.append(f'--{p= rogram_name}=3D{path}')
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if namespace:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 args.append('--nam= espace=3D' + namespace)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 gtkdoc_exe_wrapper =3D
>state.environment.properties.host.get('gtkdoc_exe_wrapper', Non= e)
>diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do- >not-manipulate-the-environment-when.patch b/meta/recipes-
>devtools/meson/meson/0001-python-module-do-not-manipulate-the-
>environment-when.patch
>index eb0e90dbdd..fdadc6869b 100644
>--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
>manipulate-the-environment-when.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
>manipu
>+++ late-the-environment-when.patch
>@@ -1,4 +1,4 @@
>-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001=
>+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00
>2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Mon, 19 Nov 2018 14:24:26 +0100
> Subject: [PATCH] python module: do not manipulate the environment when=
>calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin
><alex.ka= navin@gmail.com>
>=C2=A0 1 file changed, 12 deletions(-)
>
> diff --git a/mesonbuild/modules/python.py
>b/mesonbuild/modules/python.py -index 07be318..b770603 100644
>+index 422155b..aaf5844 100644
> --- a/mesonbuild/modules/python.py
> +++ b/mesonbuild/modules/python.py
>-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
>+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 old_pkg_= libdir =3D os.environ.get('PKG_CONFIG_LIBDIR')
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 old_pkg_= path =3D os.environ.get('PKG_CONFIG_PATH')
>
>@@ -26,9 +26,9 @@ index 07be318..b770603 100644
> -
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 try:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 self.pkgdep =3D PkgConfigDependency(pkg_name, environment,
>kwargs)
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mlog.debug('Found "{}" via pkgconfig lookup in LIBPC >({})'.format(pkg_name, pkg_libdir))
>-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mlog.debug('"{}" could not be found in LIBPC
>({})'.format(pkg_name, pkg_libdir))
>+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mlog.debug(f'Found "{pkg_name}" via pkgconfig
>+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class
>PythonDependency(ExternalDependency):
>+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mlog.debug(f'"{pkg_name}" could not be found in
>+LIBPC ({pkg_libdir})')
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 mlog.debug(e)
>
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if old_pkg_pa= th is not None:
>@@ -39,5 +39,5 @@ index 07be318..b770603 100644
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 else:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= os.environ.pop('PKG_CONFIG_LIBDIR', None)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 else:
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mlog.deb= ug('"{}" could not be found in LIBPC ({}), this is likely due= to
>a relocated python installation'.format(pkg_name, pkg_libdir))
>+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mlog.deb= ug(f'"{pkg_name}" could not be found in LIBPC
>+ ({pkg_libdir}), this is likely due to a relocated python
>+ installation')
>
>diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building- >allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002- >Support-building-allarch-recipes-again.patch
>index f6175a194c..dcc1ce9c27 100644
>--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-<= br> >recipes-again.patch
>+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-<= br> >re
>+++ cipes-again.patch
>@@ -1,19 +1,18 @@
>-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00
>2001
>+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00
>2001
> From: Peter Kjellerstedt <pkj@axis.com>
> Date: Thu, 26 Jul 2018 16:32:49 +0200
>-Subject: [PATCH] Support building allarch recipes again
>+Subject: [PATCH 2/2] Support building allarch recipes again
>
> This registers "allarch" as a known CPU family.
>
> Upstream-Status: Inappropriate [OE specific]
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
>-
> ---
>=C2=A0 mesonbuild/envconfig.py | 1 +
>=C2=A0 1 file changed, 1 insertion(+)
>
> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index<= br> >2d3c34c..b9e7908 100644
>+index 4d58c91..ff01ad1 100644
> --- a/mesonbuild/envconfig.py
> +++ b/mesonbuild/envconfig.py
> @@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index
>2d3c34c..b9e7908 100644
>=C2=A0 =C2=A0 =C2=A0 'aarch64',
>=C2=A0 =C2=A0 =C2=A0 'alpha',
>=C2=A0 =C2=A0 =C2=A0 'arc',
>+--
>+2.24.0
>+
>diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch=
>b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>index ed85116c4f..89257b9e05 100644
>--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>@@ -1,4 +1,4 @@
>-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00
>2001
>+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00
>2001
> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> Date: Wed, 15 Nov 2017 15:05:01 +0100
> Subject: [PATCH] native_bindir
>@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado
><rica= rdo.ribalda@gmail.com>
>
> ---
>=C2=A0 mesonbuild/dependencies/base.py | 19 +++++++++++--------
>- mesonbuild/dependencies/ui.py=C2=A0 =C2=A0|=C2=A0 6 +++---
>- 2 files changed, 14 insertions(+), 11 deletions(-)
>+ 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/mesonbuild/dependencies/base.py
>b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644
>+index 14380d4..d0c443f 100644
> --- a/mesonbuild/dependencies/base.py
> +++ b/mesonbuild/dependencies/base.py
>-@@ -192,7 +192,7 @@ class Dependency:
>+@@ -179,7 +179,7 @@ class Dependency:
>=C2=A0 =C2=A0 =C2=A0 def get_exe_args(self, compiler):
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return []
>
> -=C2=A0 =C2=A0 def get_pkgconfig_variable(self, variable_name: str, kw= args: T.Dict[str,
>T.Any]) -> str:
> +=C2=A0 =C2=A0 def get_pkgconfig_variable(self, variable_name: str, kw= args: T.Dict[str,
>T.Any], use_native=3DFalse) -> str:
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0raise DependencyException('{!r} = is not a pkgconfig
>dependency'.format(self.name))
>+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0raise DependencyException(f'{self.name!r} is not a pkgconfig
>+ dependency')
>
>=C2=A0 =C2=A0 =C2=A0 def get_configtool_variable(self, variable_name):<= br> >-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
>+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return True
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return any(d.is_built() for d in sel= f.ext_deps)
>
>@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 raise DependencyException('Metho= d "get_pkgconfig_variable()" is '
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 'invalid for an= internal dependency')
>
>-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency): >+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency): >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return s.format(self.__class__.__nam= e__, self= .name, self.is_found,
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 self.version_reqs)
>
>@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 p, out, err =3D Popen_safe(cmd, env= =3Denv)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 rc, out, err =3D p.returncode, out.s= trip(), err.strip()
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 call =3D ' '.join(cmd)
>-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0env['PKG_CONFIG_LI= BDIR'] =3D new_pkg_config_libdir
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mlog.debug('PKG_CO= NFIG_LIBDIR: ' + new_pkg_config_libdir)
>+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
>+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if key.startswith('= ;PKG_'):
>+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mlog.deb= ug(f'env[{key}]: {value}')
>
> -=C2=A0 =C2=A0 def _call_pkgbin(self, args, env=3DNone):
> +=C2=A0 =C2=A0 def _call_pkgbin(self, args, env=3DNone, use_native=3DF= alse):
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Always copy the environment since = we're going to modify it
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # with pkg-config variables
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if env is None:
>-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 targs =3D tuple(args)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cache =3D PkgConfigDependency.pkgbin= _cache
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (self.pkgbin, targs, fenv) not in= cache:
>@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return cache[(self.pkgbin, targs, fe= nv)]
>
>=C2=A0 =C2=A0 =C2=A0 def _convert_mingw_paths(self, args: T.List[str]) = -> T.List[str]:
>-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (self.name= , out_raw))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 self.link_args, self.raw_link_args = =3D self._search_libs(out, out_raw)
>
>@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 options =3D ['--variable=3D'= + variable_name, self.name]
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if 'define_variable' in kwar= gs:
>-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 options =3D ['--de= fine-variable=3D' + '=3D'.join(definition)] + options
>
>@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 variable =3D ''
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if ret !=3D 0:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if self.required:
>-diff --git a/mesonbuild/dependencies/ui.py
>b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644
>---- a/mesonbuild/dependencies/ui.py
>-+++ b/mesonbuild/dependencies/ui.py
>-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.bindir =3D self.get_pkgconfig_h= ost_bins(core)
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if not self.bindir:
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# If exec_prefix is no= t defined, the pkg-config file is broken
>--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 prefix =3D core.get_pkgconf= ig_variable('exec_prefix', {})
>-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 prefix =3D core.get_pkgconf= ig_variable('exec_prefix', {},
>-+ use_native=3DTrue)
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if prefix:
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.bin= dir =3D os.path.join(prefix, 'bin')
>-
>-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0applications =3D ['moc', = 9;uic', 'rcc', 'lupdate', 'lrelease']
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0for application in applications:
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0try:
>--=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return os.pat= h.dirname(core.get_pkgconfig_variable('%s_location' %
>application, {}))
>-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return
>-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' %<= br> >-+ application, {}, use_native=3DTrue))
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0except MesonException:=
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0pass
>-
>-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0QtBaseDependency.__init__(self, '= ;qt5', env, kwargs)
>-
>-=C2=A0 =C2=A0 =C2=A0def get_pkgconfig_host_bins(self, core):
>--=C2=A0 =C2=A0 =C2=A0 =C2=A0 return core.get_pkgconfig_variable('h= ost_bins', {})
>-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return core.get_pkgconfig_variable('h= ost_bins', {},
>-+ use_native=3DTrue)
>-
>-=C2=A0 =C2=A0 =C2=A0def get_private_includes(self, mod_inc_dir, module= ):
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return _qt_get_private_includes(mod_= inc_dir, module, self.version)
>diff --git a/meta/recipes-devtools/meson/meson/cross-prop-default.patch=
>b/meta/recipes-devtools/meson/meson/cross-prop-default.patch
>deleted file mode 100644
>index 772395e879..0000000000
>--- a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-meson.build files that use cc.run() in native builds can silently fall= back to
>-meson.get_cross_property() in cross builds without an exe-wrapper, but=
>there's -no way to know that this is happening.
>-
>-As the defaults may be pessimistic (for example, disabling the support= for a -
>feature that should be enabled) emit a warning when the default is used= , so
>that -the recipe can explicitly set the cross property as relevant.
>-
>-Upstream-Status: Submitted
>[https://github.com/mesonbuild/meson/pull/5071]=
>-Signed-off-by: Ross Burton <ross.burton@intel.com>
>-
>-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -in= dex
>3c3cfae0..10e741ae 100644
>---- a/mesonbuild/interpreter.py
>-+++ b/mesonbuild/interpreter.py
>-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return props[propname]=
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0except Exception:
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if len(args) =3D=3D 2:=
>-+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mlog.warning(= 'Cross property %s is using default value
>-+ %s' % (propname, args[1]))
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return a= rgs[1]
>-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0raise InterpreterExcep= tion('Unknown cross property: %s.' % propname)
>-
>diff --git a/meta/recipes-devtools/meson/meson_0.57.2.bb b/meta/recipe= s-
>devtools/meson/meson_0.58.0.bb
>similarity index 100%
>rename from meta/recipes-devtools/meson/meson_0.57.2.bb
>rename to meta/recipes-devtools/meson/meson_0.58.0.bb
>diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.= bb
>b/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
>similarity index 100%
>rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.b= b
>rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb<= /a>
>--
>2.31.1