diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch index fadb2734f4..f4456235fe 100644 --- a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch +++ b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-check-environment-for-vari.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 63e79329b5dd00882f0cea56a6d907a831b94171 Mon Sep 17 00:00:00 2001 | 1 | From a72dc2b1cddcf180ce782860896deae0b12d5000 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 25 Mar 2019 18:52:48 +0100 | 3 | Date: Mon, 25 Mar 2019 18:52:48 +0100 |
4 | Subject: [PATCH] mesonbuild/environment.py: check environment for various | 4 | Subject: [PATCH] mesonbuild/environment.py: check environment for various |
@@ -6,23 +6,21 @@ Subject: [PATCH] mesonbuild/environment.py: check environment for various | |||
6 | 6 | ||
7 | Upstream-Status: Inappropriate [oe-core specific] | 7 | Upstream-Status: Inappropriate [oe-core specific] |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | |||
9 | --- | 10 | --- |
10 | mesonbuild/environment.py | 2 +- | 11 | mesonbuild/environment.py | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 13 | ||
13 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 14 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
14 | index 6e5d689..bbfd87d 100644 | 15 | index 9a029f4..0cfdf9c 100644 |
15 | --- a/mesonbuild/environment.py | 16 | --- a/mesonbuild/environment.py |
16 | +++ b/mesonbuild/environment.py | 17 | +++ b/mesonbuild/environment.py |
17 | @@ -398,7 +398,7 @@ class Environment: | 18 | @@ -448,7 +448,7 @@ class Environment: |
18 | config = MesonConfigFile.from_config_parser( | 19 | config = MesonConfigFile.from_config_parser( |
19 | coredata.load_configs(self.coredata.cross_files, 'cross')) | 20 | coredata.load_configs(self.coredata.cross_files)) |
20 | self.properties.host = Properties(config.get('properties', {}), False) | 21 | properties.host = Properties(config.get('properties', {}), False) |
21 | - self.binaries.host = BinaryTable(config.get('binaries', {}), False) | 22 | - binaries.host = BinaryTable(config.get('binaries', {}), False) |
22 | + self.binaries.host = BinaryTable(config.get('binaries', {}), True) | 23 | + binaries.host = BinaryTable(config.get('binaries', {}), True) |
23 | if 'host_machine' in config: | 24 | if 'host_machine' in config: |
24 | self.machines.host = MachineInfo.from_literal(config['host_machine']) | 25 | machines.host = MachineInfo.from_literal(config['host_machine']) |
25 | if 'target_machine' in config: | 26 | if 'target_machine' in config: |
26 | -- | ||
27 | 2.17.1 | ||
28 | |||