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 | 32 |
1 files changed, 16 insertions, 16 deletions
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 <ricardo.ribalda@gmail.com> 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 <ricardo.ribalda@gmail.com> - --- 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): |