mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
meson: update 0.55.0 -> 0.55.1
(From OE-Core rev: 177e0fa5fd79c174c6ab27b645f5fd17817de1c8) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
9dc084a30c
commit
bdaf3023e5
@@ -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-modules-python.py-do-not-substitute-python-s-install.patch \
|
||||||
file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
|
file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35"
|
SRC_URI[sha256sum] = "3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080"
|
||||||
|
|
||||||
SRC_URI_append_class-native = " \
|
SRC_URI_append_class-native = " \
|
||||||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
From 5624b5835af747b601780ad14646f9c1fb854931 Mon Sep 17 00:00:00 2001
|
From 9311844b6c422479556e83b89a8e675ebcb2056c Mon Sep 17 00:00:00 2001
|
||||||
From: Ross Burton <ross.burton@intel.com>
|
From: Ross Burton <ross.burton@intel.com>
|
||||||
Date: Tue, 3 Jul 2018 13:59:09 +0100
|
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]
|
Upstream-Status: Inappropriate [OE specific]
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
@@ -39,6 +39,3 @@ index bf09a88..8eabe78 100644
|
|||||||
|
|
||||||
return trial
|
return trial
|
||||||
|
|
||||||
--
|
|
||||||
2.24.0
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
From 4b283d545152092fec12b9d80219161d11002c72 Mon Sep 17 00:00:00 2001
|
From 38f59e256f760aa959c13f4c5713f87ff7addee5 Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Kjellerstedt <pkj@axis.com>
|
From: Peter Kjellerstedt <pkj@axis.com>
|
||||||
Date: Thu, 26 Jul 2018 16:32:49 +0200
|
Date: Thu, 26 Jul 2018 16:32:49 +0200
|
||||||
Subject: [PATCH] Support building allarch recipes again
|
Subject: [PATCH] Support building allarch recipes again
|
||||||
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
|
|||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
|
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
|
||||||
index dc20616..f54adcd 100644
|
index d1be65b..90f3573 100644
|
||||||
--- a/mesonbuild/envconfig.py
|
--- a/mesonbuild/envconfig.py
|
||||||
+++ b/mesonbuild/envconfig.py
|
+++ b/mesonbuild/envconfig.py
|
||||||
@@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
|
@@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
From da2091f6dfe978fc6140fc2d01bcafbbfae8d8db Mon Sep 17 00:00:00 2001
|
From f06c89939d0d006090a8a8728b2a13d532b83047 Mon Sep 17 00:00:00 2001
|
||||||
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
|
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
|
||||||
Date: Wed, 15 Nov 2017 15:05:01 +0100
|
Date: Wed, 15 Nov 2017 15:05:01 +0100
|
||||||
Subject: [PATCH] native_bindir
|
Subject: [PATCH] native_bindir
|
||||||
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
|
|||||||
2 files changed, 14 insertions(+), 11 deletions(-)
|
2 files changed, 14 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
|
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
|
||||||
index 50f4179..e1529d8 100644
|
index 368a4bc..9fc398e 100644
|
||||||
--- a/mesonbuild/dependencies/base.py
|
--- a/mesonbuild/dependencies/base.py
|
||||||
+++ b/mesonbuild/dependencies/base.py
|
+++ b/mesonbuild/dependencies/base.py
|
||||||
@@ -157,7 +157,7 @@ class Dependency:
|
@@ -183,7 +183,7 @@ class Dependency:
|
||||||
def get_exe_args(self, compiler):
|
def get_exe_args(self, compiler):
|
||||||
return []
|
return []
|
||||||
|
|
||||||
@@ -34,16 +34,16 @@ index 50f4179..e1529d8 100644
|
|||||||
raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
|
raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
|
||||||
|
|
||||||
def get_configtool_variable(self, variable_name):
|
def get_configtool_variable(self, variable_name):
|
||||||
@@ -225,7 +225,7 @@ class InternalDependency(Dependency):
|
@@ -261,7 +261,7 @@ class InternalDependency(Dependency):
|
||||||
self.ext_deps = ext_deps
|
setattr(result, k, copy.deepcopy(v, memo))
|
||||||
self.variables = variables
|
return result
|
||||||
|
|
||||||
- def get_pkgconfig_variable(self, variable_name, kwargs):
|
- 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, kwargs, use_native=False):
|
||||||
raise DependencyException('Method "get_pkgconfig_variable()" is '
|
raise DependencyException('Method "get_pkgconfig_variable()" is '
|
||||||
'invalid for an internal dependency')
|
'invalid for an internal dependency')
|
||||||
|
|
||||||
@@ -633,15 +633,18 @@ class PkgConfigDependency(ExternalDependency):
|
@@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency):
|
||||||
return s.format(self.__class__.__name__, self.name, self.is_found,
|
return s.format(self.__class__.__name__, self.name, self.is_found,
|
||||||
self.version_reqs)
|
self.version_reqs)
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ index 50f4179..e1529d8 100644
|
|||||||
# Always copy the environment since we're going to modify it
|
# Always copy the environment since we're going to modify it
|
||||||
# with pkg-config variables
|
# with pkg-config variables
|
||||||
if env is None:
|
if env is None:
|
||||||
@@ -667,7 +670,7 @@ class PkgConfigDependency(ExternalDependency):
|
@@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency):
|
||||||
targs = tuple(args)
|
targs = tuple(args)
|
||||||
cache = PkgConfigDependency.pkgbin_cache
|
cache = PkgConfigDependency.pkgbin_cache
|
||||||
if (self.pkgbin, targs, fenv) not in cache:
|
if (self.pkgbin, targs, fenv) not in cache:
|
||||||
@@ -74,7 +74,7 @@ index 50f4179..e1529d8 100644
|
|||||||
return cache[(self.pkgbin, targs, fenv)]
|
return cache[(self.pkgbin, targs, fenv)]
|
||||||
|
|
||||||
def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
|
def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
|
||||||
@@ -876,7 +879,7 @@ class PkgConfigDependency(ExternalDependency):
|
@@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency):
|
||||||
(self.name, out_raw))
|
(self.name, out_raw))
|
||||||
self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
|
self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
|
||||||
|
|
||||||
@@ -83,7 +83,7 @@ index 50f4179..e1529d8 100644
|
|||||||
options = ['--variable=' + variable_name, self.name]
|
options = ['--variable=' + variable_name, self.name]
|
||||||
|
|
||||||
if 'define_variable' in kwargs:
|
if 'define_variable' in kwargs:
|
||||||
@@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency):
|
@@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency):
|
||||||
|
|
||||||
options = ['--define-variable=' + '='.join(definition)] + options
|
options = ['--define-variable=' + '='.join(definition)] + options
|
||||||
|
|
||||||
@@ -93,10 +93,10 @@ index 50f4179..e1529d8 100644
|
|||||||
if ret != 0:
|
if ret != 0:
|
||||||
if self.required:
|
if self.required:
|
||||||
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
|
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
|
||||||
index 741f0b8..134dd54 100644
|
index 95dfe2b..5f82890 100644
|
||||||
--- a/mesonbuild/dependencies/ui.py
|
--- a/mesonbuild/dependencies/ui.py
|
||||||
+++ b/mesonbuild/dependencies/ui.py
|
+++ b/mesonbuild/dependencies/ui.py
|
||||||
@@ -320,7 +320,7 @@ class QtBaseDependency(ExternalDependency):
|
@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
|
||||||
self.bindir = self.get_pkgconfig_host_bins(core)
|
self.bindir = self.get_pkgconfig_host_bins(core)
|
||||||
if not self.bindir:
|
if not self.bindir:
|
||||||
# If exec_prefix is not defined, the pkg-config file is broken
|
# If exec_prefix is not defined, the pkg-config file is broken
|
||||||
@@ -105,7 +105,7 @@ index 741f0b8..134dd54 100644
|
|||||||
if prefix:
|
if prefix:
|
||||||
self.bindir = os.path.join(prefix, 'bin')
|
self.bindir = os.path.join(prefix, 'bin')
|
||||||
|
|
||||||
@@ -524,7 +524,7 @@ class Qt4Dependency(QtBaseDependency):
|
@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
|
||||||
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
|
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
|
||||||
for application in applications:
|
for application in applications:
|
||||||
try:
|
try:
|
||||||
@@ -114,7 +114,7 @@ index 741f0b8..134dd54 100644
|
|||||||
except MesonException:
|
except MesonException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -534,7 +534,7 @@ class Qt5Dependency(QtBaseDependency):
|
@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
|
||||||
QtBaseDependency.__init__(self, 'qt5', env, kwargs)
|
QtBaseDependency.__init__(self, 'qt5', env, kwargs)
|
||||||
|
|
||||||
def get_pkgconfig_host_bins(self, core):
|
def get_pkgconfig_host_bins(self, core):
|
||||||
|
|||||||
Reference in New Issue
Block a user