diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-08-23 22:20:31 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-25 16:00:11 +0100 |
commit | bdaf3023e548a6ef7b335af4922082ed3f747eaa (patch) | |
tree | 30d50209ba91ba56ff34ec922608c8c3e6ad060b /meta/recipes-devtools/meson/meson/0003-native_bindir.patch | |
parent | 9dc084a30c2aa350334cbfe9d7ce5c23691b1e99 (diff) | |
download | poky-bdaf3023e548a6ef7b335af4922082ed3f747eaa.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0003-native_bindir.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index fb119ae852..5d7bdc2f59 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 @@ | |||
1 | From da2091f6dfe978fc6140fc2d01bcafbbfae8d8db Mon Sep 17 00:00:00 2001 | 1 | From f06c89939d0d006090a8a8728b2a13d532b83047 Mon Sep 17 00:00:00 2001 |
2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> |
3 | Date: Wed, 15 Nov 2017 15:05:01 +0100 | 3 | Date: Wed, 15 Nov 2017 15:05:01 +0100 |
4 | Subject: [PATCH] native_bindir | 4 | Subject: [PATCH] native_bindir |
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | |||
22 | 2 files changed, 14 insertions(+), 11 deletions(-) | 22 | 2 files changed, 14 insertions(+), 11 deletions(-) |
23 | 23 | ||
24 | diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py | 24 | diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py |
25 | index 50f4179..e1529d8 100644 | 25 | index 368a4bc..9fc398e 100644 |
26 | --- a/mesonbuild/dependencies/base.py | 26 | --- a/mesonbuild/dependencies/base.py |
27 | +++ b/mesonbuild/dependencies/base.py | 27 | +++ b/mesonbuild/dependencies/base.py |
28 | @@ -157,7 +157,7 @@ class Dependency: | 28 | @@ -183,7 +183,7 @@ class Dependency: |
29 | def get_exe_args(self, compiler): | 29 | def get_exe_args(self, compiler): |
30 | return [] | 30 | return [] |
31 | 31 | ||
@@ -34,16 +34,16 @@ index 50f4179..e1529d8 100644 | |||
34 | raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) | 34 | raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) |
35 | 35 | ||
36 | def get_configtool_variable(self, variable_name): | 36 | def get_configtool_variable(self, variable_name): |
37 | @@ -225,7 +225,7 @@ class InternalDependency(Dependency): | 37 | @@ -261,7 +261,7 @@ class InternalDependency(Dependency): |
38 | self.ext_deps = ext_deps | 38 | setattr(result, k, copy.deepcopy(v, memo)) |
39 | self.variables = variables | 39 | return result |
40 | 40 | ||
41 | - def get_pkgconfig_variable(self, variable_name, kwargs): | 41 | - def get_pkgconfig_variable(self, variable_name, kwargs): |
42 | + def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): | 42 | + def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): |
43 | raise DependencyException('Method "get_pkgconfig_variable()" is ' | 43 | raise DependencyException('Method "get_pkgconfig_variable()" is ' |
44 | 'invalid for an internal dependency') | 44 | 'invalid for an internal dependency') |
45 | 45 | ||
46 | @@ -633,15 +633,18 @@ class PkgConfigDependency(ExternalDependency): | 46 | @@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency): |
47 | return s.format(self.__class__.__name__, self.name, self.is_found, | 47 | return s.format(self.__class__.__name__, self.name, self.is_found, |
48 | self.version_reqs) | 48 | self.version_reqs) |
49 | 49 | ||
@@ -65,7 +65,7 @@ index 50f4179..e1529d8 100644 | |||
65 | # Always copy the environment since we're going to modify it | 65 | # Always copy the environment since we're going to modify it |
66 | # with pkg-config variables | 66 | # with pkg-config variables |
67 | if env is None: | 67 | if env is None: |
68 | @@ -667,7 +670,7 @@ class PkgConfigDependency(ExternalDependency): | 68 | @@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency): |
69 | targs = tuple(args) | 69 | targs = tuple(args) |
70 | cache = PkgConfigDependency.pkgbin_cache | 70 | cache = PkgConfigDependency.pkgbin_cache |
71 | if (self.pkgbin, targs, fenv) not in cache: | 71 | if (self.pkgbin, targs, fenv) not in cache: |
@@ -74,7 +74,7 @@ index 50f4179..e1529d8 100644 | |||
74 | return cache[(self.pkgbin, targs, fenv)] | 74 | return cache[(self.pkgbin, targs, fenv)] |
75 | 75 | ||
76 | def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: | 76 | def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: |
77 | @@ -876,7 +879,7 @@ class PkgConfigDependency(ExternalDependency): | 77 | @@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency): |
78 | (self.name, out_raw)) | 78 | (self.name, out_raw)) |
79 | self.link_args, self.raw_link_args = self._search_libs(out, out_raw) | 79 | self.link_args, self.raw_link_args = self._search_libs(out, out_raw) |
80 | 80 | ||
@@ -83,7 +83,7 @@ index 50f4179..e1529d8 100644 | |||
83 | options = ['--variable=' + variable_name, self.name] | 83 | options = ['--variable=' + variable_name, self.name] |
84 | 84 | ||
85 | if 'define_variable' in kwargs: | 85 | if 'define_variable' in kwargs: |
86 | @@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency): | 86 | @@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency): |
87 | 87 | ||
88 | options = ['--define-variable=' + '='.join(definition)] + options | 88 | options = ['--define-variable=' + '='.join(definition)] + options |
89 | 89 | ||
@@ -93,10 +93,10 @@ index 50f4179..e1529d8 100644 | |||
93 | if ret != 0: | 93 | if ret != 0: |
94 | if self.required: | 94 | if self.required: |
95 | diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py | 95 | diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py |
96 | index 741f0b8..134dd54 100644 | 96 | index 95dfe2b..5f82890 100644 |
97 | --- a/mesonbuild/dependencies/ui.py | 97 | --- a/mesonbuild/dependencies/ui.py |
98 | +++ b/mesonbuild/dependencies/ui.py | 98 | +++ b/mesonbuild/dependencies/ui.py |
99 | @@ -320,7 +320,7 @@ class QtBaseDependency(ExternalDependency): | 99 | @@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): |
100 | self.bindir = self.get_pkgconfig_host_bins(core) | 100 | self.bindir = self.get_pkgconfig_host_bins(core) |
101 | if not self.bindir: | 101 | if not self.bindir: |
102 | # If exec_prefix is not defined, the pkg-config file is broken | 102 | # If exec_prefix is not defined, the pkg-config file is broken |
@@ -105,7 +105,7 @@ index 741f0b8..134dd54 100644 | |||
105 | if prefix: | 105 | if prefix: |
106 | self.bindir = os.path.join(prefix, 'bin') | 106 | self.bindir = os.path.join(prefix, 'bin') |
107 | 107 | ||
108 | @@ -524,7 +524,7 @@ class Qt4Dependency(QtBaseDependency): | 108 | @@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency): |
109 | applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] | 109 | applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] |
110 | for application in applications: | 110 | for application in applications: |
111 | try: | 111 | try: |
@@ -114,7 +114,7 @@ index 741f0b8..134dd54 100644 | |||
114 | except MesonException: | 114 | except MesonException: |
115 | pass | 115 | pass |
116 | 116 | ||
117 | @@ -534,7 +534,7 @@ class Qt5Dependency(QtBaseDependency): | 117 | @@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency): |
118 | QtBaseDependency.__init__(self, 'qt5', env, kwargs) | 118 | QtBaseDependency.__init__(self, 'qt5', env, kwargs) |
119 | 119 | ||
120 | def get_pkgconfig_host_bins(self, core): | 120 | def get_pkgconfig_host_bins(self, core): |