From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f46.google.com (mail-ua1-f46.google.com [209.85.222.46]) by mx.groups.io with SMTP id smtpd.web10.4981.1631178282971584087 for ; Thu, 09 Sep 2021 02:04:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nOnXOAOM; spf=pass (domain: gmail.com, ip: 209.85.222.46, mailfrom: alex.kanavin@gmail.com) Received: by mail-ua1-f46.google.com with SMTP id e20so575334uam.11 for ; Thu, 09 Sep 2021 02:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Xb+0BQtWn2/CSNsTbxpvSebGARDUEWeC5jM/5+uFQVs=; b=nOnXOAOMRDG5/1Eh2P1rlJ08sAoyUiB1FFFIcji8DfAXYVpaZ11m4mJCuDh+GfOBU9 6hpCdno6WJ0D69EqOfSKwq5Yder3M/U88OXOSsNnatMdSelKw5zh9P9v4uzbLF7lijlm /zup0AQ4GwF3xlCGe9++sedG+p0EaCFkXjyWy72MGvkO4r5709r8J7aT/lXpqVuxgReh M4EezNAh/JIDVHaUrXz+R9fzu5jfTu7s28Fqn2PfvcU7Mc0Q4QvaZ5H3Gh8MFIbpL59x 8dWA6gj7hVsQnSU9qliR7nXxzJ8it928PQMIJryzVZCKuraUmFOAsf8S+7r236zOXXwp B8OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Xb+0BQtWn2/CSNsTbxpvSebGARDUEWeC5jM/5+uFQVs=; b=oyCFKDGTp9LjwUgAODfgQ6r7AAPXQDXAQFg4+BufclaJUgr4GgY6DcgPRAwIMSZWWf DcQwqe+jbw3YX4mXt7N4w9urrNgkCmuv1YA3bBUzLoLYhs8ft7AapNQ8A/3wwScr3YXO oJyK4HnEGUdqLUPUYP1vLIsThGKff8I6HzYKbIlVCaOWQKyteeW4GMiRdWVYDu4Ux9g5 nuQ8lFhV2Yct9mhfBsefh24I0sZrHPDIYgyn6sBr+qdCs9gSuSZKu6Sru+Ivwr0jOsQf rE1y1pPHkeBx6c1JneTzi4xhcGDLPNxkFI8h0Dzi50uJ8KYM4qDS4R/JbMemP+r/gWc+ ODMQ== X-Gm-Message-State: AOAM53250HBsj+cGdKAWo3ZfXszo4jjzM5EmZaOGfn9GfJMod9ToO30c iV7ywmWA3ikgxNYf/Qw+rufAus9g6WP+Gqz3nb0= X-Google-Smtp-Source: ABdhPJy0O/JqQfBrGkeYz9DRXmdNO/4NF1WmcZ4M3eRpoJbvir0CDfy2THnWSMHLGQ7Ov4d9wfH6EC33ko1hCywpGP8= X-Received: by 2002:ab0:7a57:: with SMTP id a23mr843050uat.100.1631178281937; Thu, 09 Sep 2021 02:04:41 -0700 (PDT) MIME-Version: 1.0 References: <20210908180125.103473-1-alex.kanavin@gmail.com> In-Reply-To: From: "Alexander Kanavin" Date: Thu, 9 Sep 2021 11:04:30 +0200 Message-ID: Subject: Re: [OE-core] [PATCH 01/26] meson: update 0.58.1 -> 0.59.1 To: Peter Kjellerstedt Cc: "openembedded-core@lists.openembedded.org" Content-Type: multipart/alternative; boundary="0000000000000f6e0a05cb8c4ab5" --0000000000000f6e0a05cb8c4ab5 Content-Type: text/plain; charset="UTF-8" On Thu, 9 Sept 2021 at 11:01, Peter Kjellerstedt < peter.kjellerstedt@axis.com> wrote: > We are not using QT, so I do not know what the actual effect of that > patch being dropped is. Thus I do not know whether it is correct to > drop it or not. However, it seems that the hunks that actually added > the use_native=True arguments were dropped from the patch with the > update to 0.58.0. In that release, the QT specific functions were moved > from mesonbuild/dependencies/ui.py to mesonbuild/dependencies/qt.py > and the relevant hunks should probably have been moved along with the > code instead of being removed. > Sure, but if the patch does not clearly describe how to reproduce the problem it is aiming to solve, I'm not going to start digging or guessing. It's been a pain to rebase for a very long time, and I've had enough. Alex > > //Peter > > > Signed-off-by: Alexander Kanavin > > --- > > meta/recipes-devtools/meson/meson.inc | 4 +- > > .../0001-Make-CPU-family-warnings-fatal.patch | 20 ++-- > > .../meson/meson/0003-native_bindir.patch | 94 ------------------- > > .../meson/meson/gi-target-dep.patch | 41 -------- > > .../{meson_0.58.1.bb => meson_0.59.1.bb} | 0 > > ...on_0.58.1.bb => nativesdk-meson_0.59.1.bb} | 0 > > 6 files changed, 10 insertions(+), 149 deletions(-) > > delete mode 100644 meta/recipes-devtools/meson/meson/0003- > > native_bindir.patch > > delete mode 100644 meta/recipes-devtools/meson/meson/gi-target-dep.patch > > rename meta/recipes-devtools/meson/{meson_0.58.1.bb => meson_0.59.1.bb} > > (100%) > > rename meta/recipes-devtools/meson/{nativesdk-meson_0.58.1.bb => > > nativesdk-meson_0.59.1.bb} (100%) > > > > diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes- > > devtools/meson/meson.inc > > index f1746d2094..c83ea406f0 100644 > > --- a/meta/recipes-devtools/meson/meson.inc > > +++ b/meta/recipes-devtools/meson/meson.inc > > @@ -9,15 +9,13 @@ LIC_FILES_CHKSUM = > > "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" > > > > SRC_URI = > > "https://github.com/mesonbuild/meson/releases/download/${PV}/meson- > > ${PV}.tar.gz \ > > file://0001-gtkdoc-fix-issues-that-arise-when-cross- > > compiling.patch \ > > - file://0003-native_bindir.patch \ > > file://0001-python-module-do-not-manipulate-the-environment- > > when.patch \ > > file://disable-rpath-handling.patch \ > > file://0001-modules-python.py-do-not-substitute-python-s- > > install.patch \ > > - file://gi-target-dep.patch \ > > file://0001-Make-CPU-family-warnings-fatal.patch \ > > file://0002-Support-building-allarch-recipes-again.patch \ > > " > > -SRC_URI[sha256sum] = > > "3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d" > > +SRC_URI[sha256sum] = > > "db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d" > > > > UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" > > UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar" > > 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 bcccfabd17..c5be526b10 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- > > fatal.patch > > @@ -1,20 +1,21 @@ > > -From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001 > > +From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 > > From: Ross Burton > > Date: Tue, 3 Jul 2018 13:59:09 +0100 > > -Subject: [PATCH 1/2] Make CPU family warnings fatal > > +Subject: [PATCH] Make CPU family warnings fatal > > > > Upstream-Status: Inappropriate [OE specific] > > Signed-off-by: Ross Burton > > + > > --- > > mesonbuild/envconfig.py | 2 +- > > mesonbuild/environment.py | 4 +--- > > 2 files changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py > > -index c6a4df3..4d58c91 100644 > > +index 307aac3..66fb7ec 100644 > > --- a/mesonbuild/envconfig.py > > +++ b/mesonbuild/envconfig.py > > -@@ -266,7 +266,7 @@ class MachineInfo: > > +@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject): > > > > cpu_family = literal['cpu_family'] > > if cpu_family not in known_cpu_families: > > @@ -24,20 +25,17 @@ index c6a4df3..4d58c91 100644 > > endian = literal['endian'] > > if endian not in ('little', 'big'): > > diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py > > -index fc9b703..eea8345 100644 > > +index 71286a5..179917e 100644 > > --- a/mesonbuild/environment.py > > +++ b/mesonbuild/environment.py > > -@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> > > str: > > +@@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -> > > str: > > trial = 'ppc64' > > > > if trial not in known_cpu_families: > > -- mlog.warning('Unknown CPU family {!r}, please report this at ' > > +- mlog.warning(f'Unknown CPU family {trial!r}, please report this > > at ' > > - 'https://github.com/mesonbuild/meson/issues/new > > with the ' > > -- 'output of `uname -a` and `cat > > /proc/cpuinfo`'.format(trial)) > > +- 'output of `uname -a` and `cat /proc/cpuinfo`') > > + raise EnvironmentException('Unknown CPU family %s, see > > https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % > > trial) > > > > return trial > > > > --- > > -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 > > deleted file mode 100644 > > index 89257b9e05..0000000000 > > --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch > > +++ /dev/null > > @@ -1,94 +0,0 @@ > > -From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001 > > -From: Ricardo Ribalda Delgado > > -Date: Wed, 15 Nov 2017 15:05:01 +0100 > > -Subject: [PATCH] native_bindir > > - > > -Some libraries, like QT, have pre-processors that convert their input > > -files into something that the cross-compiler can process. We find the > > -path of those pre-processors via pkg-config-native instead of > > -pkg-config. > > - > > -This path forces the use of pkg-config-native for host_bins arguments. > > - > > -There are some discussions upstream to merge this patch, but I presonaly > > believe > > -that is is OE only. > > https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 > > - > > -Upstream-Status: Inappropriate [OE specific] > > -Signed-off-by: Ricardo Ribalda Delgado > > - > > ---- > > - mesonbuild/dependencies/base.py | 19 +++++++++++-------- > > - 1 file changed, 11 insertions(+), 8 deletions(-) > > - > > -diff --git a/mesonbuild/dependencies/base.py > > b/mesonbuild/dependencies/base.py > > -index 14380d4..d0c443f 100644 > > ---- a/mesonbuild/dependencies/base.py > > -+++ b/mesonbuild/dependencies/base.py > > -@@ -179,7 +179,7 @@ class Dependency: > > - def get_exe_args(self, compiler): > > - return [] > > - > > -- def get_pkgconfig_variable(self, variable_name: str, kwargs: > > T.Dict[str, T.Any]) -> str: > > -+ def get_pkgconfig_variable(self, variable_name: str, kwargs: > > T.Dict[str, T.Any], use_native=False) -> str: > > - raise DependencyException(f'{self.name!r} is not a pkgconfig > > dependency') > > - > > - def get_configtool_variable(self, variable_name): > > -@@ -267,7 +267,7 @@ class InternalDependency(Dependency): > > - return True > > - return any(d.is_built() for d in self.ext_deps) > > - > > -- def get_pkgconfig_variable(self, variable_name: str, kwargs: > > T.Dict[str, T.Any]) -> str: > > -+ def get_pkgconfig_variable(self, variable_name: str, kwargs: > > T.Dict[str, T.Any], use_native=False) -> str: > > - raise DependencyException('Method "get_pkgconfig_variable()" is > > ' > > - 'invalid for an internal dependency') > > - > > -@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency): > > - return s.format(self.__class__.__name__, self.name, > > self.is_found, > > - self.version_reqs) > > - > > -- def _call_pkgbin_real(self, args, env): > > -- cmd = self.pkgbin.get_command() + args > > -+ def _call_pkgbin_real(self, args, env, use_native=False): > > -+ if use_native: > > -+ cmd = [self.pkgbin.get_command()[0] + "-native"] + args > > -+ else: > > -+ cmd = self.pkgbin.get_command() + args > > - p, out, err = Popen_safe(cmd, env=env) > > - rc, out, err = p.returncode, out.strip(), err.strip() > > - call = ' '.join(cmd) > > -@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency): > > - if key.startswith('PKG_'): > > - mlog.debug(f'env[{key}]: {value}') > > - > > -- def _call_pkgbin(self, args, env=None): > > -+ def _call_pkgbin(self, args, env=None, use_native=False): > > - # Always copy the environment since we're going to modify it > > - # with pkg-config variables > > - if env is None: > > -@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency): > > - targs = tuple(args) > > - cache = PkgConfigDependency.pkgbin_cache > > - if (self.pkgbin, targs, fenv) not in cache: > > -- cache[(self.pkgbin, targs, fenv)] = > > self._call_pkgbin_real(args, env) > > -+ cache[(self.pkgbin, targs, fenv)] = > > self._call_pkgbin_real(args, env, use_native) > > - return cache[(self.pkgbin, targs, fenv)] > > - > > - def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: > > -@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency): > > - (self.name, out_raw)) > > - self.link_args, self.raw_link_args = self._search_libs(out, > > out_raw) > > - > > -- def get_pkgconfig_variable(self, variable_name: str, kwargs: > > T.Dict[str, T.Any]) -> str: > > -+ def get_pkgconfig_variable(self, variable_name: str, kwargs: > > T.Dict[str, T.Any], use_native=False) -> str: > > - options = ['--variable=' + variable_name, self.name] > > - > > - if 'define_variable' in kwargs: > > -@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): > > - > > - options = ['--define-variable=' + '='.join(definition)] + > > options > > - > > -- ret, out, err = self._call_pkgbin(options) > > -+ ret, out, err = self._call_pkgbin(options, > > use_native=use_native) > > - variable = '' > > - if ret != 0: > > - if self.required: > > diff --git a/meta/recipes-devtools/meson/meson/gi-target-dep.patch > > b/meta/recipes-devtools/meson/meson/gi-target-dep.patch > > deleted file mode 100644 > > index 29e164ccc7..0000000000 > > --- a/meta/recipes-devtools/meson/meson/gi-target-dep.patch > > +++ /dev/null > > @@ -1,41 +0,0 @@ > > -When building gobject-introspection we want the *native* binaries (as > > they need > > -to be executed) but *host* gobject-introspection libraries, as otherwise > > the > > -native pkg-config can be used and the build will try to link native and > > host > > -binaries together. > > - > > -Upstream-Status: Backport [589236226856f591c9e8daf0cb7aa1aef8862388] > > -Signed-off-by: Ross Burton > > - > > -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py > > -index f9660838e..2eefc3fc7 100644 > > ---- a/mesonbuild/modules/gnome.py > > -+++ b/mesonbuild/modules/gnome.py > > -@@ -84,8 +84,8 @@ class GnomeModule(ExtensionModule): > > - > > mlog.bold('https://github.com/mesonbuild/meson/issues/1387'), > > - once=True) > > - > > -- def _get_native_dep(self, state, depname, required=True): > > -- kwargs = {'native': True, 'required': required} > > -+ def _get_dep(self, state, depname, native=False, required=True): > > -+ kwargs = {'native': native, 'required': required} > > - holder = self.interpreter.func_dependency(state.current_node, > > [depname], kwargs) > > - return holder.held_object > > - > > -@@ -101,7 +101,7 @@ class GnomeModule(ExtensionModule): > > - return ExternalProgram.from_entry(name, prog) > > - > > - # Check if pkgconfig has a variable > > -- dep = self._get_native_dep(state, depname, required=False) > > -+ dep = self._get_dep(state, depname, native=True, > required=False) > > - if dep.found() and dep.type_name == 'pkgconfig': > > - value = dep.get_pkgconfig_variable(varname, {}) > > - if value: > > -@@ -481,7 +481,7 @@ class GnomeModule(ExtensionModule): > > - > > - def _get_gir_dep(self, state): > > - if not self.gir_dep: > > -- self.gir_dep = self._get_native_dep(state, 'gobject- > > introspection-1.0') > > -+ self.gir_dep = self._get_dep(state, 'gobject-introspection- > > 1.0') > > - self.giscanner = self._get_native_binary(state, 'g-ir- > > scanner', 'gobject-introspection-1.0', 'g_ir_scanner') > > - self.gicompiler = self._get_native_binary(state, 'g-ir- > > compiler', 'gobject-introspection-1.0', 'g_ir_compiler') > > - return self.gir_dep, self.giscanner, self.gicompiler > > diff --git a/meta/recipes-devtools/meson/meson_0.58.1.bb b/meta/recipes- > > devtools/meson/meson_0.59.1.bb > > similarity index 100% > > rename from meta/recipes-devtools/meson/meson_0.58.1.bb > > rename to meta/recipes-devtools/meson/meson_0.59.1.bb > > diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb > > b/meta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb > > similarity index 100% > > rename from meta/recipes-devtools/meson/nativesdk-meson_0.58.1.bb > > rename to meta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb > > -- > > 2.31.1 > > --0000000000000f6e0a05cb8c4ab5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, 9 Sept 2021 at 11:01, Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote:<= br>
We are not using= QT, so I do not know what the actual effect of that
patch being dropped is. Thus I do not know whether it is correct to
drop it or not. However, it seems that the hunks that actually added
the use_native=3DTrue arguments were dropped from the patch with the
update to 0.58.0. In that release, the QT specific functions were moved from mesonbuild/dependencies/ui.py to mesonbuild/dependencies/qt.py
and the relevant hunks should probably have been moved along with the
code instead of being removed.

Sure, bu= t if the patch does not clearly describe how to reproduce the problem it is= aiming to solve, I'm not going
to start digging or guessing.= It's been a pain to rebase for a very long time, and I've had enou= gh.

Alex

=C2=A0

//Peter

> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>=C2=A0 meta/recipes-devtools/meson/meson.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 4 +-
>=C2=A0 .../0001-Make-CPU-family-warnings-fatal.patch | 20 ++--
>=C2=A0 .../meson/meson/0003-native_bindir.patch=C2=A0 =C2=A0 =C2=A0 | 9= 4 -------------------
>=C2=A0 .../meson/meson/gi-target-dep.patch=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 41 --------
>=C2=A0 .../{meson_0.58.1.bb =3D> meson_0.59.1.bb}=C2=A0 =C2=A0 =C2= =A0 |=C2=A0 0
>=C2=A0 ...on_0.58.1.bb =3D> nativesdk-meson_0.59.1.bb} |=C2= =A0 0
>=C2=A0 6 files changed, 10 insertions(+), 149 deletions(-)
>=C2=A0 delete mode 100644 meta/recipes-devtools/meson/meson/0003-
> native_bindir.patch
>=C2=A0 delete mode 100644 meta/recipes-devtools/meson/meson/gi-target-d= ep.patch
>=C2=A0 rename meta/recipes-devtools/meson/{meson_0.58.1.bb =3D> meson_= 0.59.1.bb}
> (100%)
>=C2=A0 rename meta/recipes-devtools/meson/{nativesdk-meson_0.58.= 1.bb =3D>
> nativesdk-meson_0.59.1.bb} (100%)
>
> diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
> devtools/meson/meson.inc
> index f1746d2094..c83ea406f0 100644
> --- a/meta/recipes-devtools/meson/meson.inc
> +++ b/meta/recipes-devtools/meson/meson.inc
> @@ -9,15 +9,13 @@ LIC_FILES_CHKSUM =3D
> "file://COPYING;md5=3D3b83ef96387f14655fc854ddc3c6bd57"
>
>=C2=A0 SRC_URI =3D
> "https://github.com/= mesonbuild/meson/releases/download/${PV}/meson-
> ${PV}.tar.gz \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-gtkdoc-fix-= issues-that-arise-when-cross-
> compiling.patch \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0003-native_bindir.pa= tch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-python-modu= le-do-not-manipulate-the-environment-
> when.patch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://disable-rpath-ha= ndling.patch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-modules-pyt= hon.py-do-not-substitute-python-s-
> install.patch \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://gi-target-dep.patch \=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-Make-CPU-fa= mily-warnings-fatal.patch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0002-Support-bui= lding-allarch-recipes-again.patch \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"
> -SRC_URI[sha256sum] =3D
> "3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d= "
> +SRC_URI[sha256sum] =3D
> "db586a451650d46bbe10984a87b79d9bcdc1caebf38d8e189f8848f8d502356d= "
>
>=C2=A0 UPSTREAM_CHECK_URI =3D "https://github.c= om/mesonbuild/meson/releases"
>=C2=A0 UPSTREAM_CHECK_REGEX =3D "meson-(?P<pver>\d+(\.\d+)+)= \.tar"
> 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 bcccfabd17..c5be526b10 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-=
> fatal.patch
> @@ -1,20 +1,21 @@
> -From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 200= 1
> +From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 200= 1
>=C2=A0 From: Ross Burton <ross.burton@intel.com>
>=C2=A0 Date: Tue, 3 Jul 2018 13:59:09 +0100
> -Subject: [PATCH 1/2] Make CPU family warnings fatal
> +Subject: [PATCH] Make CPU family warnings fatal
>
>=C2=A0 Upstream-Status: Inappropriate [OE specific]
>=C2=A0 Signed-off-by: Ross Burton <ross.burton@intel.com>
> +
>=C2=A0 ---
>=C2=A0 =C2=A0mesonbuild/envconfig.py=C2=A0 =C2=A0| 2 +-
>=C2=A0 =C2=A0mesonbuild/environment.py | 4 +---
>=C2=A0 =C2=A02 files changed, 2 insertions(+), 4 deletions(-)
>
>=C2=A0 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py > -index c6a4df3..4d58c91 100644
> +index 307aac3..66fb7ec 100644
>=C2=A0 --- a/mesonbuild/envconfig.py
>=C2=A0 +++ b/mesonbuild/envconfig.py
> -@@ -266,7 +266,7 @@ class MachineInfo:
> +@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject):
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cpu_family =3D literal['cp= u_family']
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if cpu_family not in known_cpu= _families:
> @@ -24,20 +25,17 @@ index c6a4df3..4d58c91 100644
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0endian =3D literal['endian= ']
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if endian not in ('little&= #39;, 'big'):
>=C2=A0 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.= py
> -index fc9b703..eea8345 100644
> +index 71286a5..179917e 100644
>=C2=A0 --- a/mesonbuild/environment.py
>=C2=A0 +++ b/mesonbuild/environment.py
> -@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -= >
> str:
> +@@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -= >
> str:
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0trial =3D 'p= pc64'
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0if trial not in known_cpu_families:
> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 mlog.warning('Unknown CPU family {!r= }, please report this at '
> +-=C2=A0 =C2=A0 =C2=A0 =C2=A0 mlog.warning(f'Unknown CPU family {t= rial!r}, please report this
> at '
>=C2=A0 -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0'https://github.com/mesonbuild/meson/= issues/new
> with the '
> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0'output of `uname -a` and `cat
> /proc/cpuinfo`'.format(trial))
> +-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0'output of `uname -a` and `cat /proc/cpuinfo`')
>=C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 raise EnvironmentException('Unk= nown CPU family %s, see
> https://wiki.yoctoproject.org/wiki/Meson/Unk= nownCPU for directions.' %
> trial)
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0return trial
>
> ---
> -2.24.0
> -
> diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patc= h
> b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> deleted file mode 100644
> index 89257b9e05..0000000000
> --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 200= 1
> -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> -Date: Wed, 15 Nov 2017 15:05:01 +0100
> -Subject: [PATCH] native_bindir
> -
> -Some libraries, like QT, have pre-processors that convert their input=
> -files into something that the cross-compiler can process. We find the=
> -path of those pre-processors via pkg-config-native instead of
> -pkg-config.
> -
> -This path forces the use of pkg-config-native for host_bins arguments= .
> -
> -There are some discussions upstream to merge this patch, but I preson= aly
> believe
> -that is is OE only.
> https://github.com/mesonb= uild/meson/issues/1849#issuecomment-303730323
> -
> -Upstream-Status: Inappropriate [OE specific]
> -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> -
> ----
> - mesonbuild/dependencies/base.py | 19 +++++++++++--------
> - 1 file changed, 11 insertions(+), 8 deletions(-)
> -
> -diff --git a/mesonbuild/dependencies/base.py
> b/mesonbuild/dependencies/base.py
> -index 14380d4..d0c443f 100644
> ---- a/mesonbuild/dependencies/base.py
> -+++ b/mesonbuild/dependencies/base.py
> -@@ -179,7 +179,7 @@ class Dependency:
> -=C2=A0 =C2=A0 =C2=A0def get_exe_args(self, compiler):
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return []
> -
> --=C2=A0 =C2=A0 def get_pkgconfig_variable(self, variable_name: str, k= wargs:
> T.Dict[str, T.Any]) -> str:
> -+=C2=A0 =C2=A0 def get_pkgconfig_variable(self, variable_name: str, k= wargs:
> T.Dict[str, T.Any], use_native=3DFalse) -> str:
> -=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=A0def get_configtool_variable(self, variable_name):=
> -@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return True
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return any(d.is_built() for d in se= lf.ext_deps)
> -
> --=C2=A0 =C2=A0 def get_pkgconfig_variable(self, variable_name: str, k= wargs:
> T.Dict[str, T.Any]) -> str:
> -+=C2=A0 =C2=A0 def get_pkgconfig_variable(self, variable_name: str, k= wargs:
> T.Dict[str, T.Any], use_native=3DFalse) -> str:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0raise DependencyException('Meth= od "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')
> -
> -@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency): > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return s.format(self.__class__.__na= me__, sel= f.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=A0self.version_reqs)
> -
> --=C2=A0 =C2=A0 def _call_pkgbin_real(self, args, env):
> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 cmd =3D self.pkgbin.get_command() + args=
> -+=C2=A0 =C2=A0 def _call_pkgbin_real(self, args, env, use_native=3DFa= lse):
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 if use_native:
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cmd =3D [self.pkgbin.get_c= ommand()[0] + "-native"] + args
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 else:
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cmd =3D self.pkgbin.get_co= mmand() + args
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0p, out, err =3D Popen_safe(cmd, env= =3Denv)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rc, out, err =3D p.returncode, out.= strip(), err.strip()
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0call =3D ' '.join(cmd)
> -@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency): > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if key.startswith(= 9;PKG_'):
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mlog.de= bug(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=3D= False):
> -=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=A0if env is None:
> -@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency): > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0targs =3D tuple(args)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cache =3D PkgConfigDependency.pkgbi= n_cache
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (self.pkgbin, targs, fenv) not i= n cache:
> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cache[(self.pkgbin, targs,= fenv)] =3D
> self._call_pkgbin_real(args, env)
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cache[(self.pkgbin, targs,= fenv)] =3D
> self._call_pkgbin_real(args, env, use_native)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return cache[(self.pkgbin, targs, f= env)]
> -
> -=C2=A0 =C2=A0 =C2=A0def _convert_mingw_paths(self, args: T.List[str])= -> T.List[str]:
> -@@ -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=A0self.link_args, self.raw_link_args = =3D self._search_libs(out,
> out_raw)
> -
> --=C2=A0 =C2=A0 def get_pkgconfig_variable(self, variable_name: str, k= wargs:
> T.Dict[str, T.Any]) -> str:
> -+=C2=A0 =C2=A0 def get_pkgconfig_variable(self, variable_name: str, k= wargs:
> T.Dict[str, T.Any], use_native=3DFalse) -> str:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0options =3D ['--variable=3D'= ; + variable_name, self.name]
> -
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if 'define_variable' in kwa= rgs:
> -@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): > -
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0options =3D ['--d= efine-variable=3D' + '=3D'.join(definition)] +
> options
> -
> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 ret, out, err =3D self._call_pkgbin(opti= ons)
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 ret, out, err =3D self._call_pkgbin(opti= ons,
> use_native=3Duse_native)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0variable =3D ''
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if ret !=3D 0:
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if self.required:
> diff --git a/meta/recipes-devtools/meson/meson/gi-target-dep.patch
> b/meta/recipes-devtools/meson/meson/gi-target-dep.patch
> deleted file mode 100644
> index 29e164ccc7..0000000000
> --- a/meta/recipes-devtools/meson/meson/gi-target-dep.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -When building gobject-introspection we want the *native* binaries (as=
> they need
> -to be executed) but *host* gobject-introspection libraries, as otherw= ise
> the
> -native pkg-config can be used and the build will try to link native a= nd
> host
> -binaries together.
> -
> -Upstream-Status: Backport [589236226856f591c9e8daf0cb7aa1aef8862388]<= br> > -Signed-off-by: Ross Burton <ross.burton@arm.com>
> -
> -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.p= y
> -index f9660838e..2eefc3fc7 100644
> ---- a/mesonbuild/modules/gnome.py
> -+++ b/mesonbuild/modules/gnome.py
> -@@ -84,8 +84,8 @@ class GnomeModule(ExtensionModule):
> -
> mlog.bold('https://github.com/mesonbuil= d/meson/issues/1387'),
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 once=3DTrue)
> -
> --=C2=A0 =C2=A0 def _get_native_dep(self, state, depname, required=3DT= rue):
> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 kwargs =3D {'native': True, '= ;required': required}
> -+=C2=A0 =C2=A0 def _get_dep(self, state, depname, native=3DFalse, req= uired=3DTrue):
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 kwargs =3D {'native': native, &#= 39;required': required}
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0holder =3D self.interpreter.func_de= pendency(state.current_node,
> [depname], kwargs)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return holder.held_object
> -
> -@@ -101,7 +101,7 @@ class GnomeModule(ExtensionModule):
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return ExternalProgra= m.from_entry(name, prog)
> -
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# Check if pkgconfig has a variable=
> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 dep =3D self._get_native_dep(state, depn= ame, required=3DFalse)
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 dep =3D self._get_dep(state, depname, na= tive=3DTrue, required=3DFalse)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if dep.found() and dep.type_name = =3D=3D 'pkgconfig':
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0value =3D dep.get_pkg= config_variable(varname, {})
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if value:
> -@@ -481,7 +481,7 @@ class GnomeModule(ExtensionModule):
> -
> -=C2=A0 =C2=A0 =C2=A0def _get_gir_dep(self, state):
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if not self.gir_dep:
> --=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 self.gir_dep =3D self._get= _native_dep(state, 'gobject-
> introspection-1.0')
> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 self.gir_dep =3D self._get= _dep(state, 'gobject-introspection-
> 1.0')
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.giscanner =3D se= lf._get_native_binary(state, 'g-ir-
> scanner', 'gobject-introspection-1.0', 'g_ir_scanner&#= 39;)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0self.gicompiler =3D s= elf._get_native_binary(state, 'g-ir-
> compiler', 'gobject-introspection-1.0', 'g_ir_compiler= ')
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return self.gir_dep, self.giscanner= , self.gicompiler
> diff --git a/meta/recipes-devtools/meson/meson_0.58.1.bb b/meta/recip= es-
> devtools/meson/meson_0.59.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/meson_0.58.1.bb
> rename to meta/recipes-devtools/meson/meson_0.59.1.bb
> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.58.1= .bb
> b/meta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/nativesdk-meson_0.58.1.= bb
> rename to meta/recipes-devtools/meson/nativesdk-meson_0.59.1.bb=
> --
> 2.31.1

--0000000000000f6e0a05cb8c4ab5--