mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 06:32:13 +02:00
meson: update 1.0.1 ->1.1.0
Rebase a patch.
Remove unneeded patch:
Khem confirmed that upstream fixed the issue with
24ea1d3f19
(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>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
5f08f9e0fc
commit
4bc0bdfabf
@@ -1,56 +0,0 @@
|
||||
From 8739e1c3bef653415ad4b9b9c318ccfa76c43da6 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 31 Mar 2022 15:00:24 -0700
|
||||
Subject: [PATCH] Check for clang before guessing gcc or lcc
|
||||
|
||||
clang --version can yield a string like below when its installed into
|
||||
such a directory
|
||||
|
||||
clang version 14.0.0 (https://github.com/llvm/llvm-project 3f43d803382d57e3fc010ca19833077d1023e9c9)
|
||||
Target: aarch64-yoe-linux
|
||||
Thread model: posix
|
||||
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
|
||||
|
||||
as you can see InstallDir has 'xt-' subtring and this trips the check to
|
||||
guess gcc
|
||||
|
||||
if 'Free Software Foundation' in out or 'xt-' in out:
|
||||
|
||||
Therefore, check if compiler is clang then there is no point of running
|
||||
this check anyway.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/10218]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
mesonbuild/compilers/detect.py | 15 ++++++++-------
|
||||
1 file changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py
|
||||
index 53948b01a..ba335cf39 100644
|
||||
--- a/mesonbuild/compilers/detect.py
|
||||
+++ b/mesonbuild/compilers/detect.py
|
||||
@@ -427,13 +427,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
|
||||
version = search_version(out)
|
||||
|
||||
guess_gcc_or_lcc: T.Optional[str] = None
|
||||
- if 'Free Software Foundation' in out or 'xt-' in out:
|
||||
- guess_gcc_or_lcc = 'gcc'
|
||||
- if 'e2k' in out and 'lcc' in out:
|
||||
- guess_gcc_or_lcc = 'lcc'
|
||||
- if 'Microchip Technology' in out:
|
||||
- # this output has "Free Software Foundation" in its version
|
||||
- guess_gcc_or_lcc = None
|
||||
+ if not 'clang' in compiler_name:
|
||||
+ if 'Free Software Foundation' in out or 'xt-' in out:
|
||||
+ guess_gcc_or_lcc = 'gcc'
|
||||
+ if 'e2k' in out and 'lcc' in out:
|
||||
+ guess_gcc_or_lcc = 'lcc'
|
||||
+ if 'Microchip Technology' in out:
|
||||
+ # this output has "Free Software Foundation" in its version
|
||||
+ guess_gcc_or_lcc = None
|
||||
|
||||
if guess_gcc_or_lcc:
|
||||
defines = _get_gnu_compiler_defines(compiler)
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2e9582167bf9d3273004edb2637310531f0155ab Mon Sep 17 00:00:00 2001
|
||||
From a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 19 Nov 2018 14:24:26 +0100
|
||||
Subject: [PATCH] python module: do not manipulate the environment when calling
|
||||
@@ -8,30 +8,30 @@ Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
mesonbuild/modules/python.py | 6 +-----
|
||||
mesonbuild/dependencies/python.py | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
|
||||
index 3bbccd1..fda7a25 100644
|
||||
--- a/mesonbuild/modules/python.py
|
||||
+++ b/mesonbuild/modules/python.py
|
||||
@@ -277,9 +277,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
|
||||
# there is no LIBPC, so we can't search in it
|
||||
return NotFoundDependency('python', env)
|
||||
diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
|
||||
index 14386f9..118a15f 100644
|
||||
--- a/mesonbuild/dependencies/python.py
|
||||
+++ b/mesonbuild/dependencies/python.py
|
||||
@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
|
||||
empty.name = 'python'
|
||||
return empty
|
||||
|
||||
- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None)
|
||||
- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None)
|
||||
- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
|
||||
try:
|
||||
return PythonPkgConfigDependency(name, env, kwargs, installation, True)
|
||||
finally:
|
||||
@@ -288,8 +285,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
|
||||
os.environ[name] = value
|
||||
elif name in os.environ:
|
||||
del os.environ[name]
|
||||
- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir)
|
||||
- set_env('PKG_CONFIG_PATH', old_pkg_path)
|
||||
+ pass
|
||||
- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None)
|
||||
- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None)
|
||||
- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
|
||||
try:
|
||||
return PythonPkgConfigDependency(name, env, kwargs, installation, True)
|
||||
finally:
|
||||
@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
|
||||
os.environ[name] = value
|
||||
elif name in os.environ:
|
||||
del os.environ[name]
|
||||
- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir)
|
||||
- set_env('PKG_CONFIG_PATH', old_pkg_path)
|
||||
+ pass
|
||||
|
||||
candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation))
|
||||
# We only need to check both, if a python install has a LIBPC. It might point to the wrong location,
|
||||
candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation))
|
||||
# We only need to check both, if a python install has a LIBPC. It might point to the wrong location,
|
||||
|
||||
@@ -14,9 +14,8 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
|
||||
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
|
||||
file://0001-Make-CPU-family-warnings-fatal.patch \
|
||||
file://0002-Support-building-allarch-recipes-again.patch \
|
||||
file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "d926b730de6f518728cc7c57bc5e701667bae0c3522f9e369427b2cc7839d3c1"
|
||||
SRC_URI[sha256sum] = "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f"
|
||||
|
||||
inherit python_setuptools_build_meta github-releases
|
||||
|
||||
Reference in New Issue
Block a user