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 | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index f00327714b..da477454cb 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 0eec9428376450917098c68539a6c9dd60b85d93 Mon Sep 17 00:00:00 2001 | 1 | From e762d85c823adfefc27ba6128c7b997aa50166ce 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 |
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | |||
22 | 2 files changed, 14 insertions(+), 11 deletions(-) | 22 | 2 files changed, 14 insertions(+), 11 deletions(-) |
23 | 23 | ||
24 | 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 |
25 | index 0114a14..f4f19c5 100644 | 25 | index 6d3678f..90fdb80 100644 |
26 | --- a/mesonbuild/dependencies/base.py | 26 | --- a/mesonbuild/dependencies/base.py |
27 | +++ b/mesonbuild/dependencies/base.py | 27 | +++ b/mesonbuild/dependencies/base.py |
28 | @@ -141,7 +141,7 @@ class Dependency: | 28 | @@ -146,7 +146,7 @@ class Dependency: |
29 | def need_threads(self): | 29 | def need_threads(self): |
30 | return False | 30 | return False |
31 | 31 | ||
@@ -34,7 +34,7 @@ index 0114a14..f4f19c5 100644 | |||
34 | raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) | 34 | raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) |
35 | 35 | ||
36 | def get_configtool_variable(self, variable_name): | 36 | def get_configtool_variable(self, variable_name): |
37 | @@ -178,7 +178,7 @@ class InternalDependency(Dependency): | 37 | @@ -183,7 +183,7 @@ class InternalDependency(Dependency): |
38 | self.sources = sources | 38 | self.sources = sources |
39 | self.ext_deps = ext_deps | 39 | self.ext_deps = ext_deps |
40 | 40 | ||
@@ -43,25 +43,29 @@ index 0114a14..f4f19c5 100644 | |||
43 | raise DependencyException('Method "get_pkgconfig_variable()" is ' | 43 | raise DependencyException('Method "get_pkgconfig_variable()" is ' |
44 | 'invalid for an internal dependency') | 44 | 'invalid for an internal dependency') |
45 | 45 | ||
46 | @@ -517,11 +517,14 @@ class PkgConfigDependency(ExternalDependency): | 46 | @@ -523,15 +523,18 @@ class PkgConfigDependency(ExternalDependency): |
47 | return s.format(self.__class__.__name__, self.name, self.is_found, | 47 | return s.format(self.__class__.__name__, self.name, self.is_found, |
48 | self.version_reqs) | 48 | self.version_reqs) |
49 | 49 | ||
50 | - def _call_pkgbin_real(self, args, env): | 50 | - def _call_pkgbin_real(self, args, env): |
51 | - p, out = Popen_safe(self.pkgbin.get_command() + args, env=env)[0:2] | 51 | - cmd = self.pkgbin.get_command() + args |
52 | + def _call_pkgbin_real(self, args, env, use_native=False): | 52 | + def _call_pkgbin_real(self, args, env, use_native=False): |
53 | + if use_native: | 53 | + if use_native: |
54 | + p, out = Popen_safe(self.pkgbin.get_command() + "-native" + args, env=env)[0:2] | 54 | + cmd = self.pkgbin.get_command() + "-native" + args |
55 | + else: | 55 | + else: |
56 | + p, out = Popen_safe(self.pkgbin.get_command() + args, env=env)[0:2] | 56 | + cmd = self.pkgbin.get_command() + args |
57 | return p.returncode, out.strip() | 57 | p, out = Popen_safe(cmd, env=env)[0:2] |
58 | rc, out = p.returncode, out.strip() | ||
59 | call = ' '.join(cmd) | ||
60 | mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) | ||
61 | return rc, out | ||
58 | 62 | ||
59 | - def _call_pkgbin(self, args, env=None): | 63 | - def _call_pkgbin(self, args, env=None): |
60 | + def _call_pkgbin(self, args, env=None, use_native=False): | 64 | + def _call_pkgbin(self, args, env=None, use_native=False): |
61 | if env is None: | 65 | if env is None: |
62 | fenv = env | 66 | fenv = env |
63 | env = os.environ | 67 | env = os.environ |
64 | @@ -530,7 +533,7 @@ class PkgConfigDependency(ExternalDependency): | 68 | @@ -540,7 +543,7 @@ class PkgConfigDependency(ExternalDependency): |
65 | targs = tuple(args) | 69 | targs = tuple(args) |
66 | cache = PkgConfigDependency.pkgbin_cache | 70 | cache = PkgConfigDependency.pkgbin_cache |
67 | if (self.pkgbin, targs, fenv) not in cache: | 71 | if (self.pkgbin, targs, fenv) not in cache: |
@@ -70,16 +74,16 @@ index 0114a14..f4f19c5 100644 | |||
70 | return cache[(self.pkgbin, targs, fenv)] | 74 | return cache[(self.pkgbin, targs, fenv)] |
71 | 75 | ||
72 | def _convert_mingw_paths(self, args): | 76 | def _convert_mingw_paths(self, args): |
73 | @@ -630,7 +633,7 @@ class PkgConfigDependency(ExternalDependency): | 77 | @@ -718,7 +721,7 @@ class PkgConfigDependency(ExternalDependency): |
74 | # linkers such as MSVC, so prepend them. | 78 | (self.name, out_raw)) |
75 | self.link_args = ['-L' + lp for lp in libpaths] + self.link_args | 79 | self.link_args, self.raw_link_args = self._search_libs(out, out_raw) |
76 | 80 | ||
77 | - def get_pkgconfig_variable(self, variable_name, kwargs): | 81 | - def get_pkgconfig_variable(self, variable_name, kwargs): |
78 | + def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): | 82 | + def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): |
79 | options = ['--variable=' + variable_name, self.name] | 83 | options = ['--variable=' + variable_name, self.name] |
80 | 84 | ||
81 | if 'define_variable' in kwargs: | 85 | if 'define_variable' in kwargs: |
82 | @@ -643,7 +646,7 @@ class PkgConfigDependency(ExternalDependency): | 86 | @@ -731,7 +734,7 @@ class PkgConfigDependency(ExternalDependency): |
83 | 87 | ||
84 | options = ['--define-variable=' + '='.join(definition)] + options | 88 | options = ['--define-variable=' + '='.join(definition)] + options |
85 | 89 | ||
@@ -89,10 +93,10 @@ index 0114a14..f4f19c5 100644 | |||
89 | if ret != 0: | 93 | if ret != 0: |
90 | if self.required: | 94 | if self.required: |
91 | diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py | 95 | diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py |
92 | index 2f31196..916f648 100644 | 96 | index 197d22c..c683d21 100644 |
93 | --- a/mesonbuild/dependencies/ui.py | 97 | --- a/mesonbuild/dependencies/ui.py |
94 | +++ b/mesonbuild/dependencies/ui.py | 98 | +++ b/mesonbuild/dependencies/ui.py |
95 | @@ -240,7 +240,7 @@ class QtBaseDependency(ExternalDependency): | 99 | @@ -285,7 +285,7 @@ class QtBaseDependency(ExternalDependency): |
96 | self.bindir = self.get_pkgconfig_host_bins(core) | 100 | self.bindir = self.get_pkgconfig_host_bins(core) |
97 | if not self.bindir: | 101 | if not self.bindir: |
98 | # If exec_prefix is not defined, the pkg-config file is broken | 102 | # If exec_prefix is not defined, the pkg-config file is broken |
@@ -101,7 +105,7 @@ index 2f31196..916f648 100644 | |||
101 | if prefix: | 105 | if prefix: |
102 | self.bindir = os.path.join(prefix, 'bin') | 106 | self.bindir = os.path.join(prefix, 'bin') |
103 | 107 | ||
104 | @@ -374,7 +374,7 @@ class Qt4Dependency(QtBaseDependency): | 108 | @@ -427,7 +427,7 @@ class Qt4Dependency(QtBaseDependency): |
105 | applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] | 109 | applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] |
106 | for application in applications: | 110 | for application in applications: |
107 | try: | 111 | try: |
@@ -110,12 +114,12 @@ index 2f31196..916f648 100644 | |||
110 | except MesonException: | 114 | except MesonException: |
111 | pass | 115 | pass |
112 | 116 | ||
113 | @@ -384,7 +384,7 @@ class Qt5Dependency(QtBaseDependency): | 117 | @@ -437,7 +437,7 @@ class Qt5Dependency(QtBaseDependency): |
114 | QtBaseDependency.__init__(self, 'qt5', env, kwargs) | 118 | QtBaseDependency.__init__(self, 'qt5', env, kwargs) |
115 | 119 | ||
116 | def get_pkgconfig_host_bins(self, core): | 120 | def get_pkgconfig_host_bins(self, core): |
117 | - return core.get_pkgconfig_variable('host_bins', {}) | 121 | - return core.get_pkgconfig_variable('host_bins', {}) |
118 | + return core.get_pkgconfig_variable('host_bins', {}, use_native=True) | 122 | + return core.get_pkgconfig_variable('host_bins', {}, use_native=True) |
119 | 123 | ||
120 | 124 | def get_private_includes(self, mod_inc_dir, module): | |
121 | # There are three different ways of depending on SDL2: | 125 | return _qt_get_private_includes(mod_inc_dir, module, self.version) |