diff options
author | Ross Burton <ross.burton@intel.com> | 2017-06-26 16:11:15 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-01 09:59:26 +0200 |
commit | 529ae57ac9a8997cbbce9614ca036e4b631bd7ef (patch) | |
tree | e66996d545ceec4253a8631700f157a913a9cb6b /meta-oe/recipes-devtools/meson | |
parent | 6e2d975fc16f4228a2d952bde1a874f337281ada (diff) | |
download | meta-openembedded-529ae57ac9a8997cbbce9614ca036e4b631bd7ef.tar.gz |
meson: remove redundant patch
This patch doesn't apply to 0.40.1 and hopefully the PKG_CONFIG patch fixes the
problem with the wrong pkg-config binary being invoked.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/meson')
-rw-r--r-- | meta-oe/recipes-devtools/meson/meson/native_bindir.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch b/meta-oe/recipes-devtools/meson/meson/native_bindir.patch deleted file mode 100644 index 53eeff7b6..000000000 --- a/meta-oe/recipes-devtools/meson/meson/native_bindir.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py | ||
2 | index da73a57b7ecd..22100f69c580 100644 | ||
3 | --- a/mesonbuild/dependencies.py | ||
4 | +++ b/mesonbuild/dependencies.py | ||
5 | @@ -65,7 +65,7 @@ class Dependency(): | ||
6 | def need_threads(self): | ||
7 | return False | ||
8 | |||
9 | - def get_pkgconfig_variable(self, variable_name): | ||
10 | + def get_pkgconfig_variable(self, variable_name, use_native=False): | ||
11 | raise MesonException('Tried to get a pkg-config variable from a non-pkgconfig dependency.') | ||
12 | |||
13 | class InternalDependency(Dependency): | ||
14 | @@ -177,8 +177,12 @@ class PkgConfigDependency(Dependency): | ||
15 | return s.format(self.__class__.__name__, self.name, self.is_found, | ||
16 | self.version_reqs) | ||
17 | |||
18 | - def _call_pkgbin(self, args): | ||
19 | - p, out = Popen_safe([self.pkgbin] + args, env=os.environ)[0:2] | ||
20 | + def _call_pkgbin(self, args, use_native=False): | ||
21 | + if use_native: | ||
22 | + pkgbin = [self.pkgbin + "-native"] | ||
23 | + else: | ||
24 | + pkgbin = [self.pkgbin] | ||
25 | + p, out = Popen_safe(pkgbin + args, env=os.environ)[0:2] | ||
26 | return (p.returncode, out.strip()) | ||
27 | |||
28 | def _set_cargs(self): | ||
29 | @@ -212,8 +216,8 @@ class PkgConfigDependency(Dependency): | ||
30 | self.is_libtool = True | ||
31 | self.libs.append(lib) | ||
32 | |||
33 | - def get_pkgconfig_variable(self, variable_name): | ||
34 | - ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name]) | ||
35 | + def get_pkgconfig_variable(self, variable_name, use_native=False): | ||
36 | + ret, out = self._call_pkgbin(['--variable=' + variable_name, self.name], use_native=use_native) | ||
37 | variable = '' | ||
38 | if ret != 0: | ||
39 | if self.required: | ||
40 | @@ -933,10 +937,10 @@ class QtBaseDependency(Dependency): | ||
41 | corekwargs = {'required': 'false', 'silent': 'true'} | ||
42 | core = PkgConfigDependency(self.qtpkgname + 'Core', env, corekwargs) | ||
43 | # Used by self.compilers_detect() | ||
44 | - self.bindir = core.get_pkgconfig_variable('host_bins') | ||
45 | + self.bindir = core.get_pkgconfig_variable('host_bins', use_native=True) | ||
46 | if not self.bindir: | ||
47 | # If exec_prefix is not defined, the pkg-config file is broken | ||
48 | - prefix = core.get_pkgconfig_variable('exec_prefix') | ||
49 | + prefix = core.get_pkgconfig_variable('exec_prefix', use_native=True) | ||
50 | if prefix: | ||
51 | self.bindir = os.path.join(prefix, 'bin') | ||
52 | |||