diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0003-native_bindir.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index fb55a05187..ed85116c4f 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 cbc27ee1576b4d04ad8e9d80760c63a9d3b7f5ed Mon Sep 17 00:00:00 2001 | 1 | From 1546e1f95a119175b7a4e4272a26dd85505e5ede 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 |
@@ -15,16 +15,17 @@ that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment | |||
15 | 15 | ||
16 | Upstream-Status: Inappropriate [OE specific] | 16 | Upstream-Status: Inappropriate [OE specific] |
17 | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 17 | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> |
18 | |||
18 | --- | 19 | --- |
19 | mesonbuild/dependencies/base.py | 19 +++++++++++-------- | 20 | mesonbuild/dependencies/base.py | 19 +++++++++++-------- |
20 | mesonbuild/dependencies/ui.py | 6 +++--- | 21 | mesonbuild/dependencies/ui.py | 6 +++--- |
21 | 2 files changed, 14 insertions(+), 11 deletions(-) | 22 | 2 files changed, 14 insertions(+), 11 deletions(-) |
22 | 23 | ||
23 | 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 |
24 | index 3a5f5f8..0af89f8 100644 | 25 | index cd77b4b..7e3f338 100644 |
25 | --- a/mesonbuild/dependencies/base.py | 26 | --- a/mesonbuild/dependencies/base.py |
26 | +++ b/mesonbuild/dependencies/base.py | 27 | +++ b/mesonbuild/dependencies/base.py |
27 | @@ -183,7 +183,7 @@ class Dependency: | 28 | @@ -192,7 +192,7 @@ class Dependency: |
28 | def get_exe_args(self, compiler): | 29 | def get_exe_args(self, compiler): |
29 | return [] | 30 | return [] |
30 | 31 | ||
@@ -33,16 +34,16 @@ index 3a5f5f8..0af89f8 100644 | |||
33 | raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) | 34 | raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) |
34 | 35 | ||
35 | def get_configtool_variable(self, variable_name): | 36 | def get_configtool_variable(self, variable_name): |
36 | @@ -261,7 +261,7 @@ class InternalDependency(Dependency): | 37 | @@ -280,7 +280,7 @@ class InternalDependency(Dependency): |
37 | setattr(result, k, copy.deepcopy(v, memo)) | 38 | return True |
38 | return result | 39 | return any(d.is_built() for d in self.ext_deps) |
39 | 40 | ||
40 | - def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: | 41 | - def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: |
41 | + def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: | 42 | + def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: |
42 | raise DependencyException('Method "get_pkgconfig_variable()" is ' | 43 | raise DependencyException('Method "get_pkgconfig_variable()" is ' |
43 | 'invalid for an internal dependency') | 44 | 'invalid for an internal dependency') |
44 | 45 | ||
45 | @@ -639,8 +639,11 @@ class PkgConfigDependency(ExternalDependency): | 46 | @@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency): |
46 | return s.format(self.__class__.__name__, self.name, self.is_found, | 47 | return s.format(self.__class__.__name__, self.name, self.is_found, |
47 | self.version_reqs) | 48 | self.version_reqs) |
48 | 49 | ||
@@ -56,16 +57,16 @@ index 3a5f5f8..0af89f8 100644 | |||
56 | p, out, err = Popen_safe(cmd, env=env) | 57 | p, out, err = Popen_safe(cmd, env=env) |
57 | rc, out, err = p.returncode, out.strip(), err.strip() | 58 | rc, out, err = p.returncode, out.strip(), err.strip() |
58 | call = ' '.join(cmd) | 59 | call = ' '.join(cmd) |
59 | @@ -666,7 +669,7 @@ class PkgConfigDependency(ExternalDependency): | 60 | @@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency): |
61 | env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir | ||
60 | mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) | 62 | mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) |
61 | 63 | ||
62 | |||
63 | - def _call_pkgbin(self, args, env=None): | 64 | - def _call_pkgbin(self, args, env=None): |
64 | + def _call_pkgbin(self, args, env=None, use_native=False): | 65 | + def _call_pkgbin(self, args, env=None, use_native=False): |
65 | # Always copy the environment since we're going to modify it | 66 | # Always copy the environment since we're going to modify it |
66 | # with pkg-config variables | 67 | # with pkg-config variables |
67 | if env is None: | 68 | if env is None: |
68 | @@ -680,7 +683,7 @@ class PkgConfigDependency(ExternalDependency): | 69 | @@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency): |
69 | targs = tuple(args) | 70 | targs = tuple(args) |
70 | cache = PkgConfigDependency.pkgbin_cache | 71 | cache = PkgConfigDependency.pkgbin_cache |
71 | if (self.pkgbin, targs, fenv) not in cache: | 72 | if (self.pkgbin, targs, fenv) not in cache: |
@@ -74,7 +75,7 @@ index 3a5f5f8..0af89f8 100644 | |||
74 | return cache[(self.pkgbin, targs, fenv)] | 75 | return cache[(self.pkgbin, targs, fenv)] |
75 | 76 | ||
76 | def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: | 77 | def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: |
77 | @@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency): | 78 | @@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency): |
78 | (self.name, out_raw)) | 79 | (self.name, out_raw)) |
79 | self.link_args, self.raw_link_args = self._search_libs(out, out_raw) | 80 | self.link_args, self.raw_link_args = self._search_libs(out, out_raw) |
80 | 81 | ||
@@ -83,7 +84,7 @@ index 3a5f5f8..0af89f8 100644 | |||
83 | options = ['--variable=' + variable_name, self.name] | 84 | options = ['--variable=' + variable_name, self.name] |
84 | 85 | ||
85 | if 'define_variable' in kwargs: | 86 | if 'define_variable' in kwargs: |
86 | @@ -902,7 +905,7 @@ class PkgConfigDependency(ExternalDependency): | 87 | @@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency): |
87 | 88 | ||
88 | options = ['--define-variable=' + '='.join(definition)] + options | 89 | options = ['--define-variable=' + '='.join(definition)] + options |
89 | 90 | ||
@@ -93,7 +94,7 @@ index 3a5f5f8..0af89f8 100644 | |||
93 | if ret != 0: | 94 | if ret != 0: |
94 | if self.required: | 95 | if self.required: |
95 | diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py | 96 | diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py |
96 | index 5dffd3a..fb3a178 100644 | 97 | index d897d76..a598d2e 100644 |
97 | --- a/mesonbuild/dependencies/ui.py | 98 | --- a/mesonbuild/dependencies/ui.py |
98 | +++ b/mesonbuild/dependencies/ui.py | 99 | +++ b/mesonbuild/dependencies/ui.py |
99 | @@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): | 100 | @@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): |