diff options
Diffstat (limited to 'poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch')
| -rw-r--r-- | poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index dc822fb1f..a5baca093 100644 --- a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -28,25 +28,25 @@ index 40e304c..4b687df 100644 @@ -184,7 +184,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): raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) - + def get_configtool_variable(self, variable_name): @@ -247,7 +247,7 @@ class InternalDependency(Dependency): self.sources = sources self.ext_deps = ext_deps - + - def get_pkgconfig_variable(self, variable_name, kwargs): + def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): raise DependencyException('Method "get_pkgconfig_variable()" is ' 'invalid for an internal dependency') - + @@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs) - + - def _call_pkgbin_real(self, args, env): - cmd = self.pkgbin.get_command() + args + def _call_pkgbin_real(self, args, env, use_native=False): @@ -59,7 +59,7 @@ index 40e304c..4b687df 100644 call = ' '.join(cmd) mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) return rc, out, err - + - 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 @@ -72,21 +72,21 @@ index 40e304c..4b687df 100644 - cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env) + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: @@ -907,7 +910,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): options = ['--variable=' + variable_name, self.name] - + if 'define_variable' in kwargs: @@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency): - + options = ['--define-variable=' + '='.join(definition)] + options - + - ret, out, err = self._call_pkgbin(options) + ret, out, err = self._call_pkgbin(options, use_native=use_native) variable = '' @@ -104,7 +104,7 @@ index da411ef..856506a 100644 + prefix = core.get_pkgconfig_variable('exec_prefix', {}, use_native=True) if prefix: self.bindir = os.path.join(prefix, 'bin') - + @@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: @@ -113,13 +113,13 @@ index da411ef..856506a 100644 + return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}, use_native=True)) except MesonException: pass - + @@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) - + def get_pkgconfig_host_bins(self, core): - return core.get_pkgconfig_variable('host_bins', {}) + return core.get_pkgconfig_variable('host_bins', {}, use_native=True) - + def get_private_includes(self, mod_inc_dir, module): return _qt_get_private_includes(mod_inc_dir, module, self.version) |