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 | 69 |
1 files changed, 40 insertions, 29 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 af5e6a190..da477454c 100644 --- a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,7 +1,7 @@ -From ffa72eac56558aa4171dd70ac1e9c27a07338fa2 Mon Sep 17 00:00:00 2001 +From e762d85c823adfefc27ba6128c7b997aa50166ce 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 4/4] native_bindir +Subject: [PATCH] native_bindir Some libraries, like QT, have pre-processors that convert their input files into something that the cross-compiler can process. We find the @@ -17,15 +17,15 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> --- - mesonbuild/dependencies/base.py | 16 ++++++++++------ + mesonbuild/dependencies/base.py | 19 +++++++++++-------- mesonbuild/dependencies/ui.py | 6 +++--- - 2 files changed, 13 insertions(+), 9 deletions(-) + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index bf79bc5..c9fd08c 100644 +index 6d3678f..90fdb80 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -131,7 +131,7 @@ class Dependency: +@@ -146,7 +146,7 @@ class Dependency: def need_threads(self): return False @@ -34,7 +34,7 @@ index bf79bc5..c9fd08c 100644 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) def get_configtool_variable(self, variable_name): -@@ -150,7 +150,7 @@ class InternalDependency(Dependency): +@@ -183,7 +183,7 @@ class InternalDependency(Dependency): self.sources = sources self.ext_deps = ext_deps @@ -43,33 +43,47 @@ index bf79bc5..c9fd08c 100644 raise DependencyException('Method "get_pkgconfig_variable()" is ' 'invalid for an internal dependency') -@@ -425,10 +425,14 @@ class PkgConfigDependency(ExternalDependency): +@@ -523,15 +523,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): ++ if use_native: ++ cmd = self.pkgbin.get_command() + "-native" + args ++ else: ++ cmd = self.pkgbin.get_command() + args + p, out = Popen_safe(cmd, env=env)[0:2] + rc, out = p.returncode, out.strip() + call = ' '.join(cmd) + mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) + return rc, out + - def _call_pkgbin(self, args, env=None): + def _call_pkgbin(self, args, env=None, use_native=False): - if not env: + if env is None: + fenv = env env = os.environ -- p, out = Popen_safe([self.pkgbin] + args, env=env)[0:2] -+ if use_native: -+ pkgbin = [self.pkgbin + "-native"] -+ else: -+ pkgbin = [self.pkgbin] -+ p, out = Popen_safe(pkgbin + args, env=env)[0:2] - return p.returncode, out.strip() +@@ -540,7 +543,7 @@ class PkgConfigDependency(ExternalDependency): + targs = tuple(args) + cache = PkgConfigDependency.pkgbin_cache + if (self.pkgbin, targs, fenv) not in cache: +- 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): -@@ -522,7 +526,7 @@ class PkgConfigDependency(ExternalDependency): - # linkers such as MSVC, so prepend them. - self.link_args = ['-L' + lp for lp in libpaths] + self.link_args +@@ -718,7 +721,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: -@@ -535,7 +539,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -731,7 +734,7 @@ class PkgConfigDependency(ExternalDependency): options = ['--define-variable=' + '='.join(definition)] + options @@ -79,10 +93,10 @@ index bf79bc5..c9fd08c 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 1db518c..4ed1d04 100644 +index 197d22c..c683d21 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py -@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency): +@@ -285,7 +285,7 @@ class QtBaseDependency(ExternalDependency): self.bindir = self.get_pkgconfig_host_bins(core) if not self.bindir: # If exec_prefix is not defined, the pkg-config file is broken @@ -91,7 +105,7 @@ index 1db518c..4ed1d04 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -427,7 +427,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -100,15 +114,12 @@ index 1db518c..4ed1d04 100644 except MesonException: pass -@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -437,7 +437,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) - - # There are three different ways of depending on SDL2: --- -2.15.1 - + def get_private_includes(self, mod_inc_dir, module): + return _qt_get_private_includes(mod_inc_dir, module, self.version) |
