diff options
Diffstat (limited to 'meta/recipes-devtools/meson')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson_1.4.0.bb (renamed from meta/recipes-devtools/meson/meson_1.3.1.bb) | 6 |
4 files changed, 15 insertions, 18 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 8ea7c35950..94129b2f25 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | |||
@@ -1,21 +1,20 @@ | |||
1 | From b77cbe67df5fa0998946503f207c256ee740bb5f Mon Sep 17 00:00:00 2001 | 1 | From c61c93f43b70ba0670d41e841bff9f2a7186cc2f Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 | 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 |
4 | Subject: [PATCH] Make CPU family warnings fatal | 4 | Subject: [PATCH] Make CPU family warnings fatal |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [OE specific] | 6 | Upstream-Status: Inappropriate [OE specific] |
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
8 | |||
9 | --- | 8 | --- |
10 | mesonbuild/envconfig.py | 4 ++-- | 9 | mesonbuild/envconfig.py | 4 ++-- |
11 | mesonbuild/environment.py | 6 ++---- | 10 | mesonbuild/environment.py | 6 ++---- |
12 | 2 files changed, 4 insertions(+), 6 deletions(-) | 11 | 2 files changed, 4 insertions(+), 6 deletions(-) |
13 | 12 | ||
14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 13 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
15 | index 07f1229..a35c356 100644 | 14 | index 0e9cd23..b44e60c 100644 |
16 | --- a/mesonbuild/envconfig.py | 15 | --- a/mesonbuild/envconfig.py |
17 | +++ b/mesonbuild/envconfig.py | 16 | +++ b/mesonbuild/envconfig.py |
18 | @@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): | 17 | @@ -276,8 +276,8 @@ class MachineInfo(HoldableObject): |
19 | 'but is missing {}.'.format(minimum_literal - set(literal))) | 18 | 'but is missing {}.'.format(minimum_literal - set(literal))) |
20 | 19 | ||
21 | cpu_family = literal['cpu_family'] | 20 | cpu_family = literal['cpu_family'] |
@@ -27,10 +26,10 @@ index 07f1229..a35c356 100644 | |||
27 | endian = literal['endian'] | 26 | endian = literal['endian'] |
28 | if endian not in ('little', 'big'): | 27 | if endian not in ('little', 'big'): |
29 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 28 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
30 | index 2ba2054..d798e3b 100644 | 29 | index af69f64..248d6dd 100644 |
31 | --- a/mesonbuild/environment.py | 30 | --- a/mesonbuild/environment.py |
32 | +++ b/mesonbuild/environment.py | 31 | +++ b/mesonbuild/environment.py |
33 | @@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: | 32 | @@ -379,10 +379,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: |
34 | if compilers and not any_compiler_has_define(compilers, '__mips64'): | 33 | if compilers and not any_compiler_has_define(compilers, '__mips64'): |
35 | trial = 'mips' | 34 | trial = 'mips' |
36 | 35 | ||
diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index 2e0a4b1bbe..9f3f516a5c 100644 --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e85683698aa3556bf14fc6d35f2c067f16af520b Mon Sep 17 00:00:00 2001 | 1 | From b4c0602a56d3517ab66b98a7dbb69defe77d29a3 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, 19 Nov 2018 14:24:26 +0100 | 3 | Date: Mon, 19 Nov 2018 14:24:26 +0100 |
4 | Subject: [PATCH] python module: do not manipulate the environment when calling | 4 | Subject: [PATCH] python module: do not manipulate the environment when calling |
@@ -6,16 +6,15 @@ Subject: [PATCH] python module: do not manipulate the environment when calling | |||
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 | |||
10 | --- | 9 | --- |
11 | mesonbuild/dependencies/python.py | 6 +----- | 10 | mesonbuild/dependencies/python.py | 6 +----- |
12 | 1 file changed, 1 insertion(+), 5 deletions(-) | 11 | 1 file changed, 1 insertion(+), 5 deletions(-) |
13 | 12 | ||
14 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py | 13 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py |
15 | index 9aea6bd..8c13ede 100644 | 14 | index b9b17f8..a305afb 100644 |
16 | --- a/mesonbuild/dependencies/python.py | 15 | --- a/mesonbuild/dependencies/python.py |
17 | +++ b/mesonbuild/dependencies/python.py | 16 | +++ b/mesonbuild/dependencies/python.py |
18 | @@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 17 | @@ -381,9 +381,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
19 | empty.name = 'python' | 18 | empty.name = 'python' |
20 | return empty | 19 | return empty |
21 | 20 | ||
@@ -25,7 +24,7 @@ index 9aea6bd..8c13ede 100644 | |||
25 | try: | 24 | try: |
26 | return PythonPkgConfigDependency(name, env, kwargs, installation, True) | 25 | return PythonPkgConfigDependency(name, env, kwargs, installation, True) |
27 | finally: | 26 | finally: |
28 | @@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 27 | @@ -392,8 +389,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
29 | os.environ[name] = value | 28 | os.environ[name] = value |
30 | elif name in os.environ: | 29 | elif name in os.environ: |
31 | del os.environ[name] | 30 | del os.environ[name] |
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index a8396f30bb..fa5ea57d5b 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 Mon Sep 17 00:00:00 2001 | 1 | From 7f69bfabb87d311d7409ea6699f7dee8e9b3a95b Mon Sep 17 00:00:00 2001 |
2 | From: Peter Kjellerstedt <pkj@axis.com> | 2 | From: Peter Kjellerstedt <pkj@axis.com> |
3 | Date: Thu, 26 Jul 2018 16:32:49 +0200 | 3 | Date: Thu, 26 Jul 2018 16:32:49 +0200 |
4 | Subject: [PATCH] Support building allarch recipes again | 4 | Subject: [PATCH] Support building allarch recipes again |
@@ -7,16 +7,15 @@ This registers "allarch" as a known CPU family. | |||
7 | 7 | ||
8 | Upstream-Status: Inappropriate [OE specific] | 8 | Upstream-Status: Inappropriate [OE specific] |
9 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 9 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
10 | |||
11 | --- | 10 | --- |
12 | mesonbuild/envconfig.py | 1 + | 11 | mesonbuild/envconfig.py | 1 + |
13 | 1 file changed, 1 insertion(+) | 12 | 1 file changed, 1 insertion(+) |
14 | 13 | ||
15 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
16 | index a35c356..436355f 100644 | 15 | index b44e60c..c70e8cb 100644 |
17 | --- a/mesonbuild/envconfig.py | 16 | --- a/mesonbuild/envconfig.py |
18 | +++ b/mesonbuild/envconfig.py | 17 | +++ b/mesonbuild/envconfig.py |
19 | @@ -38,6 +38,7 @@ from pathlib import Path | 18 | @@ -28,6 +28,7 @@ from pathlib import Path |
20 | 19 | ||
21 | 20 | ||
22 | known_cpu_families = ( | 21 | known_cpu_families = ( |
diff --git a/meta/recipes-devtools/meson/meson_1.3.1.bb b/meta/recipes-devtools/meson/meson_1.4.0.bb index 3d2eedca10..5db100ff1c 100644 --- a/meta/recipes-devtools/meson/meson_1.3.1.bb +++ b/meta/recipes-devtools/meson/meson_1.4.0.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ | |||
15 | file://0001-Make-CPU-family-warnings-fatal.patch \ | 15 | file://0001-Make-CPU-family-warnings-fatal.patch \ |
16 | file://0002-Support-building-allarch-recipes-again.patch \ | 16 | file://0002-Support-building-allarch-recipes-again.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7" | 18 | SRC_URI[sha256sum] = "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d" |
19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" | 19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" |
20 | 20 | ||
21 | inherit python_setuptools_build_meta github-releases | 21 | inherit python_setuptools_build_meta github-releases |
@@ -86,7 +86,7 @@ ar = ${@meson_array('BUILD_AR', d)} | |||
86 | nm = ${@meson_array('BUILD_NM', d)} | 86 | nm = ${@meson_array('BUILD_NM', d)} |
87 | strip = ${@meson_array('BUILD_STRIP', d)} | 87 | strip = ${@meson_array('BUILD_STRIP', d)} |
88 | readelf = ${@meson_array('BUILD_READELF', d)} | 88 | readelf = ${@meson_array('BUILD_READELF', d)} |
89 | pkgconfig = 'pkg-config-native' | 89 | pkg-config = 'pkg-config-native' |
90 | 90 | ||
91 | [built-in options] | 91 | [built-in options] |
92 | c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}] | 92 | c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}] |
@@ -104,7 +104,7 @@ cpp = @CXX | |||
104 | ar = @AR | 104 | ar = @AR |
105 | nm = @NM | 105 | nm = @NM |
106 | strip = @STRIP | 106 | strip = @STRIP |
107 | pkgconfig = 'pkg-config' | 107 | pkg-config = 'pkg-config' |
108 | 108 | ||
109 | [built-in options] | 109 | [built-in options] |
110 | c_args = @CFLAGS | 110 | c_args = @CFLAGS |