William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 1 | From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> |
| 3 | Date: Wed, 15 Nov 2017 15:05:01 +0100 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH] native_bindir |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
| 6 | Some libraries, like QT, have pre-processors that convert their input |
| 7 | files into something that the cross-compiler can process. We find the |
| 8 | path of those pre-processors via pkg-config-native instead of |
| 9 | pkg-config. |
| 10 | |
| 11 | This path forces the use of pkg-config-native for host_bins arguments. |
| 12 | |
| 13 | There are some discussions upstream to merge this patch, but I presonaly believe |
| 14 | that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323 |
| 15 | |
| 16 | Upstream-Status: Inappropriate [OE specific] |
| 17 | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 18 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 19 | --- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 20 | mesonbuild/dependencies/base.py | 19 +++++++++++-------- |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 21 | 1 file changed, 11 insertions(+), 8 deletions(-) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 22 | |
| 23 | diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 24 | index 14380d4..d0c443f 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 25 | --- a/mesonbuild/dependencies/base.py |
| 26 | +++ b/mesonbuild/dependencies/base.py |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 27 | @@ -179,7 +179,7 @@ class Dependency: |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 28 | def get_exe_args(self, compiler): |
| 29 | return [] |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 30 | |
| 31 | - def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: |
| 32 | + def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 33 | raise DependencyException(f'{self.name!r} is not a pkgconfig dependency') |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 34 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 35 | def get_configtool_variable(self, variable_name): |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 36 | @@ -267,7 +267,7 @@ class InternalDependency(Dependency): |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 37 | return True |
| 38 | return any(d.is_built() for d in self.ext_deps) |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 39 | |
| 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], use_native=False) -> str: |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 42 | raise DependencyException('Method "get_pkgconfig_variable()" is ' |
| 43 | 'invalid for an internal dependency') |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 44 | |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 45 | @@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency): |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 46 | return s.format(self.__class__.__name__, self.name, self.is_found, |
| 47 | self.version_reqs) |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 48 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 49 | - def _call_pkgbin_real(self, args, env): |
| 50 | - cmd = self.pkgbin.get_command() + args |
| 51 | + def _call_pkgbin_real(self, args, env, use_native=False): |
| 52 | + if use_native: |
Brad Bishop | f3fd288 | 2019-06-21 08:06:37 -0400 | [diff] [blame] | 53 | + cmd = [self.pkgbin.get_command()[0] + "-native"] + args |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 54 | + else: |
| 55 | + cmd = self.pkgbin.get_command() + args |
William A. Kennington III | c596630 | 2020-03-20 13:04:31 -0700 | [diff] [blame] | 56 | p, out, err = Popen_safe(cmd, env=env) |
| 57 | rc, out, err = p.returncode, out.strip(), err.strip() |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 58 | call = ' '.join(cmd) |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 59 | @@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency): |
| 60 | if key.startswith('PKG_'): |
| 61 | mlog.debug(f'env[{key}]: {value}') |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 62 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 63 | - def _call_pkgbin(self, args, env=None): |
| 64 | + def _call_pkgbin(self, args, env=None, use_native=False): |
Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 65 | # Always copy the environment since we're going to modify it |
| 66 | # with pkg-config variables |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 67 | if env is None: |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 68 | @@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency): |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 69 | targs = tuple(args) |
| 70 | cache = PkgConfigDependency.pkgbin_cache |
| 71 | if (self.pkgbin, targs, fenv) not in cache: |
| 72 | - cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env) |
| 73 | + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) |
| 74 | return cache[(self.pkgbin, targs, fenv)] |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 75 | |
William A. Kennington III | c596630 | 2020-03-20 13:04:31 -0700 | [diff] [blame] | 76 | def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 77 | @@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency): |
William A. Kennington III | c596630 | 2020-03-20 13:04:31 -0700 | [diff] [blame] | 78 | (self.name, out_raw)) |
| 79 | self.link_args, self.raw_link_args = self._search_libs(out, out_raw) |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 80 | |
| 81 | - def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: |
| 82 | + def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 83 | options = ['--variable=' + variable_name, self.name] |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 84 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 85 | if 'define_variable' in kwargs: |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 86 | @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 87 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 88 | options = ['--define-variable=' + '='.join(definition)] + options |
Andrew Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 89 | |
William A. Kennington III | c596630 | 2020-03-20 13:04:31 -0700 | [diff] [blame] | 90 | - ret, out, err = self._call_pkgbin(options) |
| 91 | + ret, out, err = self._call_pkgbin(options, use_native=use_native) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 92 | variable = '' |
| 93 | if ret != 0: |
| 94 | if self.required: |