From 348372c2fefe57ca385be301dd372dcd473efd83 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 4 Dec 2020 21:07:15 +0100 Subject: meson: upgrade 0.55.1 -> 0.56.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 2 +- .../0001-Make-CPU-family-warnings-fatal.patch | 12 ++-- .../meson/meson/0003-native_bindir.patch | 32 +++++------ meta/recipes-devtools/meson/meson_0.55.1.bb | 4 -- meta/recipes-devtools/meson/meson_0.56.0.bb | 4 ++ .../meson/nativesdk-meson_0.55.1.bb | 65 ---------------------- .../meson/nativesdk-meson_0.56.0.bb | 65 ++++++++++++++++++++++ 7 files changed, 92 insertions(+), 92 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson_0.55.1.bb create mode 100644 meta/recipes-devtools/meson/meson_0.56.0.bb delete mode 100644 meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb create mode 100644 meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index 004189e36e..2d3adbdb1a 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ " -SRC_URI[sha256sum] = "3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080" +SRC_URI[sha256sum] = "291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ 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 fbc03b8ca0..86edcb5241 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,4 +1,4 @@ -From 9311844b6c422479556e83b89a8e675ebcb2056c Mon Sep 17 00:00:00 2001 +From 110a525e5ebed2fca138d72da493c39510311c1f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 219b62e..d1be65b 100644 +index 13d0ba5..5ba3a1a 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -199,7 +199,7 @@ class MachineInfo: +@@ -254,7 +254,7 @@ class MachineInfo: cpu_family = literal['cpu_family'] if cpu_family not in known_cpu_families: @@ -25,11 +25,11 @@ index 219b62e..d1be65b 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index bf09a88..8eabe78 100644 +index 588005b..988e3ea 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: - trial = 'parisc' +@@ -400,9 +400,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 ' diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 5d7bdc2f59..fb55a05187 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 f06c89939d0d006090a8a8728b2a13d532b83047 Mon Sep 17 00:00:00 2001 +From cbc27ee1576b4d04ad8e9d80760c63a9d3b7f5ed Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -15,22 +15,21 @@ that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ricardo Ribalda Delgado - --- mesonbuild/dependencies/base.py | 19 +++++++++++-------- mesonbuild/dependencies/ui.py | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 368a4bc..9fc398e 100644 +index 3a5f5f8..0af89f8 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -183,7 +183,7 @@ class Dependency: def get_exe_args(self, compiler): return [] -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): +- 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('{!r} is not a pkgconfig dependency'.format(self.name)) def get_configtool_variable(self, variable_name): @@ -38,12 +37,12 @@ index 368a4bc..9fc398e 100644 setattr(result, k, copy.deepcopy(v, memo)) return result -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): +- 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') -@@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency): +@@ -639,8 +639,11 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs) @@ -57,15 +56,16 @@ index 368a4bc..9fc398e 100644 p, out, err = Popen_safe(cmd, env=env) rc, out, err = p.returncode, out.strip(), err.strip() call = ' '.join(cmd) - mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) - return rc, out, err +@@ -666,7 +669,7 @@ class PkgConfigDependency(ExternalDependency): + mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) + - 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: -@@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -680,7 +683,7 @@ class PkgConfigDependency(ExternalDependency): targs = tuple(args) cache = PkgConfigDependency.pkgbin_cache if (self.pkgbin, targs, fenv) not in cache: @@ -74,16 +74,16 @@ index 368a4bc..9fc398e 100644 return cache[(self.pkgbin, targs, fenv)] def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: -@@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -889,7 +892,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, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): +- 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: -@@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -902,7 +905,7 @@ class PkgConfigDependency(ExternalDependency): options = ['--define-variable=' + '='.join(definition)] + options @@ -93,7 +93,7 @@ index 368a4bc..9fc398e 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 95dfe2b..5f82890 100644 +index 5dffd3a..fb3a178 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): diff --git a/meta/recipes-devtools/meson/meson_0.55.1.bb b/meta/recipes-devtools/meson/meson_0.55.1.bb deleted file mode 100644 index de9b905c12..0000000000 --- a/meta/recipes-devtools/meson/meson_0.55.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include meson.inc - -BBCLASSEXTEND = "native" - diff --git a/meta/recipes-devtools/meson/meson_0.56.0.bb b/meta/recipes-devtools/meson/meson_0.56.0.bb new file mode 100644 index 0000000000..de9b905c12 --- /dev/null +++ b/meta/recipes-devtools/meson/meson_0.56.0.bb @@ -0,0 +1,4 @@ +include meson.inc + +BBCLASSEXTEND = "native" + diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb deleted file mode 100644 index 67add2c25e..0000000000 --- a/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb +++ /dev/null @@ -1,65 +0,0 @@ -include meson.inc - -inherit nativesdk -inherit siteinfo - -SRC_URI += "file://meson-setup.py \ - file://meson-wrapper" - -def meson_endian(prefix, d): - arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS") - sitedata = siteinfo_data_for_machine(arch, os, d) - if "endian-little" in sitedata: - return "little" - elif "endian-big" in sitedata: - return "big" - else: - bb.fatal("Cannot determine endianism for %s-%s" % (arch, os)) - -# The cross file logic is similar but not identical to that in meson.bbclass, -# since it's generating for an SDK rather than a cross-compile. Important -# differences are: -# - We can't set vars like CC, CXX, etc. yet because they will be filled in with -# real paths by meson-setup.sh when the SDK is extracted. -# - Some overrides aren't needed, since the SDK injects paths that take care of -# them. -do_install_append() { - install -d ${D}${datadir}/meson - cat >${D}${datadir}/meson/meson.cross.template <${D}${datadir}/meson/meson.cross.template <