diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-01-02 15:20:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-07 12:24:57 +0000 |
commit | fc0402dbd7b88bb4d6b9c8bdd70388f61ded7a14 (patch) | |
tree | f9fe87879be0cce3d5e925db467b13a0cc8f70ef | |
parent | 0c7eca932f2798eae7978ec8a9949cdefccb3f43 (diff) | |
download | poky-fc0402dbd7b88bb4d6b9c8bdd70388f61ded7a14.tar.gz |
meson: upgrade 1.3.0 -> 1.3.1
0001-Make-CPU-family-warnings-fatal.patch
0001-python-module-do-not-manipulate-the-environment-when.patch
0002-Support-building-allarch-recipes-again.patch
refreshed for 1.3.1
(From OE-Core rev: 51b5e79cd37de982492991e56362cf1f0ef2ab8e)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson_1.3.1.bb (renamed from meta/recipes-devtools/meson/meson_1.3.0.bb) | 2 |
4 files changed, 15 insertions, 17 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 8fbcb5a0a2..8ea7c35950 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,4 +1,4 @@ | |||
1 | From fcd3260c03f313676720e6219c5953d412fb0a2c Mon Sep 17 00:00:00 2001 | 1 | From b77cbe67df5fa0998946503f207c256ee740bb5f 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 |
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
12 | 2 files changed, 4 insertions(+), 6 deletions(-) | 12 | 2 files changed, 4 insertions(+), 6 deletions(-) |
13 | 13 | ||
14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
15 | index 7e0c567..a180065 100644 | 15 | index 07f1229..a35c356 100644 |
16 | --- a/mesonbuild/envconfig.py | 16 | --- a/mesonbuild/envconfig.py |
17 | +++ b/mesonbuild/envconfig.py | 17 | +++ b/mesonbuild/envconfig.py |
18 | @@ -284,8 +284,8 @@ class MachineInfo(HoldableObject): | 18 | @@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): |
19 | 'but is missing {}.'.format(minimum_literal - set(literal))) | 19 | 'but is missing {}.'.format(minimum_literal - set(literal))) |
20 | 20 | ||
21 | cpu_family = literal['cpu_family'] | 21 | cpu_family = literal['cpu_family'] |
@@ -27,10 +27,10 @@ index 7e0c567..a180065 100644 | |||
27 | endian = literal['endian'] | 27 | endian = literal['endian'] |
28 | if endian not in ('little', 'big'): | 28 | if endian not in ('little', 'big'): |
29 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 29 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
30 | index e212c7a..9d2bff3 100644 | 30 | index 2ba2054..d798e3b 100644 |
31 | --- a/mesonbuild/environment.py | 31 | --- a/mesonbuild/environment.py |
32 | +++ b/mesonbuild/environment.py | 32 | +++ b/mesonbuild/environment.py |
33 | @@ -345,10 +345,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: | 33 | @@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: |
34 | if compilers and not any_compiler_has_define(compilers, '__mips64'): | 34 | if compilers and not any_compiler_has_define(compilers, '__mips64'): |
35 | trial = 'mips' | 35 | trial = 'mips' |
36 | 36 | ||
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 19502fa9cd..2e0a4b1bbe 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 a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 | 1 | From e85683698aa3556bf14fc6d35f2c067f16af520b 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 |
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
12 | 1 file changed, 1 insertion(+), 5 deletions(-) | 12 | 1 file changed, 1 insertion(+), 5 deletions(-) |
13 | 13 | ||
14 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py | 14 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py |
15 | index 14386f9..118a15f 100644 | 15 | index 9aea6bd..8c13ede 100644 |
16 | --- a/mesonbuild/dependencies/python.py | 16 | --- a/mesonbuild/dependencies/python.py |
17 | +++ b/mesonbuild/dependencies/python.py | 17 | +++ b/mesonbuild/dependencies/python.py |
18 | @@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 18 | @@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
19 | empty.name = 'python' | 19 | empty.name = 'python' |
20 | return empty | 20 | return empty |
21 | 21 | ||
@@ -25,7 +25,7 @@ index 14386f9..118a15f 100644 | |||
25 | try: | 25 | try: |
26 | return PythonPkgConfigDependency(name, env, kwargs, installation, True) | 26 | return PythonPkgConfigDependency(name, env, kwargs, installation, True) |
27 | finally: | 27 | finally: |
28 | @@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 28 | @@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
29 | os.environ[name] = value | 29 | os.environ[name] = value |
30 | elif name in os.environ: | 30 | elif name in os.environ: |
31 | del os.environ[name] | 31 | 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 dcc1ce9c27..a8396f30bb 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,21 +1,22 @@ | |||
1 | From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001 | 1 | From 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 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 2/2] Support building allarch recipes again | 4 | Subject: [PATCH] Support building allarch recipes again |
5 | 5 | ||
6 | This registers "allarch" as a known CPU family. | 6 | 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 | |||
10 | --- | 11 | --- |
11 | mesonbuild/envconfig.py | 1 + | 12 | mesonbuild/envconfig.py | 1 + |
12 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
13 | 14 | ||
14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 15 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
15 | index 4d58c91..ff01ad1 100644 | 16 | index a35c356..436355f 100644 |
16 | --- a/mesonbuild/envconfig.py | 17 | --- a/mesonbuild/envconfig.py |
17 | +++ b/mesonbuild/envconfig.py | 18 | +++ b/mesonbuild/envconfig.py |
18 | @@ -36,6 +36,7 @@ from pathlib import Path | 19 | @@ -38,6 +38,7 @@ from pathlib import Path |
19 | 20 | ||
20 | 21 | ||
21 | known_cpu_families = ( | 22 | known_cpu_families = ( |
@@ -23,6 +24,3 @@ index 4d58c91..ff01ad1 100644 | |||
23 | 'aarch64', | 24 | 'aarch64', |
24 | 'alpha', | 25 | 'alpha', |
25 | 'arc', | 26 | 'arc', |
26 | -- | ||
27 | 2.24.0 | ||
28 | |||
diff --git a/meta/recipes-devtools/meson/meson_1.3.0.bb b/meta/recipes-devtools/meson/meson_1.3.1.bb index e794bb28a5..3a4bb14f09 100644 --- a/meta/recipes-devtools/meson/meson_1.3.0.bb +++ b/meta/recipes-devtools/meson/meson_1.3.1.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] = "4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc" | 18 | SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7" |
19 | 19 | ||
20 | inherit python_setuptools_build_meta github-releases | 20 | inherit python_setuptools_build_meta github-releases |
21 | 21 | ||