diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-05-22 19:24:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-25 10:29:09 +0100 |
commit | 4bc0bdfabfca7a859a01a85fc8b828635c5e0a43 (patch) | |
tree | 00a676c2c01ce39fb1917cc8dde342b79e032cf8 | |
parent | 5f08f9e0fccbbe7dc8c52ae03b329200a0eceeaa (diff) | |
download | poky-4bc0bdfabfca7a859a01a85fc8b828635c5e0a43.tar.gz |
meson: update 1.0.1 ->1.1.0
Rebase a patch.
Remove unneeded patch:
Khem confirmed that upstream fixed the issue with
https://github.com/mesonbuild/meson/commit/24ea1d3f1968bff52ccaaf33fcdd59e810459aa9
(From OE-Core rev: a34cbc66a17b754b8a8053c816f384a687d4179f)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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-Check-for-clang-before-guessing-gcc-or-lcc.patch | 56 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | 48 | ||||
-rw-r--r-- | meta/recipes-devtools/meson/meson_1.1.0.bb (renamed from meta/recipes-devtools/meson/meson_1.0.1.bb) | 3 |
3 files changed, 25 insertions, 82 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch b/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch deleted file mode 100644 index 58fa119439..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 8739e1c3bef653415ad4b9b9c318ccfa76c43da6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 31 Mar 2022 15:00:24 -0700 | ||
4 | Subject: [PATCH] Check for clang before guessing gcc or lcc | ||
5 | |||
6 | clang --version can yield a string like below when its installed into | ||
7 | such a directory | ||
8 | |||
9 | clang version 14.0.0 (https://github.com/llvm/llvm-project 3f43d803382d57e3fc010ca19833077d1023e9c9) | ||
10 | Target: aarch64-yoe-linux | ||
11 | Thread model: posix | ||
12 | InstalledDir: /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/gnome-text-editor/42.0-r0/recipe-sysroot-native/usr/bin/aarch64-yoe-linux | ||
13 | |||
14 | as you can see InstallDir has 'xt-' subtring and this trips the check to | ||
15 | guess gcc | ||
16 | |||
17 | if 'Free Software Foundation' in out or 'xt-' in out: | ||
18 | |||
19 | Therefore, check if compiler is clang then there is no point of running | ||
20 | this check anyway. | ||
21 | |||
22 | Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/10218] | ||
23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
24 | --- | ||
25 | mesonbuild/compilers/detect.py | 15 ++++++++------- | ||
26 | 1 file changed, 8 insertions(+), 7 deletions(-) | ||
27 | |||
28 | diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py | ||
29 | index 53948b01a..ba335cf39 100644 | ||
30 | --- a/mesonbuild/compilers/detect.py | ||
31 | +++ b/mesonbuild/compilers/detect.py | ||
32 | @@ -427,13 +427,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin | ||
33 | version = search_version(out) | ||
34 | |||
35 | guess_gcc_or_lcc: T.Optional[str] = None | ||
36 | - if 'Free Software Foundation' in out or 'xt-' in out: | ||
37 | - guess_gcc_or_lcc = 'gcc' | ||
38 | - if 'e2k' in out and 'lcc' in out: | ||
39 | - guess_gcc_or_lcc = 'lcc' | ||
40 | - if 'Microchip Technology' in out: | ||
41 | - # this output has "Free Software Foundation" in its version | ||
42 | - guess_gcc_or_lcc = None | ||
43 | + if not 'clang' in compiler_name: | ||
44 | + if 'Free Software Foundation' in out or 'xt-' in out: | ||
45 | + guess_gcc_or_lcc = 'gcc' | ||
46 | + if 'e2k' in out and 'lcc' in out: | ||
47 | + guess_gcc_or_lcc = 'lcc' | ||
48 | + if 'Microchip Technology' in out: | ||
49 | + # this output has "Free Software Foundation" in its version | ||
50 | + guess_gcc_or_lcc = None | ||
51 | |||
52 | if guess_gcc_or_lcc: | ||
53 | defines = _get_gnu_compiler_defines(compiler) | ||
54 | -- | ||
55 | 2.35.1 | ||
56 | |||
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 f01a667818..19502fa9cd 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 2e9582167bf9d3273004edb2637310531f0155ab Mon Sep 17 00:00:00 2001 | 1 | From a97dba12cff6c4c9181909141a1a9f38d7c900bf 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 |
@@ -8,30 +8,30 @@ 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 | --- |
11 | mesonbuild/modules/python.py | 6 +----- | 11 | mesonbuild/dependencies/python.py | 6 +----- |
12 | 1 file changed, 1 insertion(+), 5 deletions(-) | 12 | 1 file changed, 1 insertion(+), 5 deletions(-) |
13 | 13 | ||
14 | diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py | 14 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py |
15 | index 3bbccd1..fda7a25 100644 | 15 | index 14386f9..118a15f 100644 |
16 | --- a/mesonbuild/modules/python.py | 16 | --- a/mesonbuild/dependencies/python.py |
17 | +++ b/mesonbuild/modules/python.py | 17 | +++ b/mesonbuild/dependencies/python.py |
18 | @@ -277,9 +277,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 18 | @@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
19 | # there is no LIBPC, so we can't search in it | 19 | empty.name = 'python' |
20 | return NotFoundDependency('python', env) | 20 | return empty |
21 | 21 | ||
22 | - old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None) | 22 | - old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None) |
23 | - old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None) | 23 | - old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None) |
24 | - os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir | 24 | - os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir |
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 | @@ -288,8 +285,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 28 | @@ -365,8 +362,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] |
32 | - set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) | 32 | - set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) |
33 | - set_env('PKG_CONFIG_PATH', old_pkg_path) | 33 | - set_env('PKG_CONFIG_PATH', old_pkg_path) |
34 | + pass | 34 | + pass |
35 | 35 | ||
36 | candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) | 36 | candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) |
37 | # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, | 37 | # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, |
diff --git a/meta/recipes-devtools/meson/meson_1.0.1.bb b/meta/recipes-devtools/meson/meson_1.1.0.bb index fd478b2161..1190d5c34d 100644 --- a/meta/recipes-devtools/meson/meson_1.0.1.bb +++ b/meta/recipes-devtools/meson/meson_1.1.0.bb | |||
@@ -14,9 +14,8 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ | |||
14 | file://0001-python-module-do-not-manipulate-the-environment-when.patch \ | 14 | file://0001-python-module-do-not-manipulate-the-environment-when.patch \ |
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 | file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ | ||
18 | " | 17 | " |
19 | SRC_URI[sha256sum] = "d926b730de6f518728cc7c57bc5e701667bae0c3522f9e369427b2cc7839d3c1" | 18 | SRC_URI[sha256sum] = "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f" |
20 | 19 | ||
21 | inherit python_setuptools_build_meta github-releases | 20 | inherit python_setuptools_build_meta github-releases |
22 | 21 | ||