mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
meson: upgrade 0.59.2 -> 0.60.1
(From OE-Core rev: 687234cbac01608053c14cbab0fba6eecbba1b91) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
5afc62d491
commit
e1691b1c84
@@ -15,7 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
|
||||
file://0002-Support-building-allarch-recipes-again.patch \
|
||||
file://0001-is_debianlike-always-return-False.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "13dee549a7ba758b7e33ce7719f28d1d337a98d10d378a4779ccc996f5a2fc49"
|
||||
SRC_URI[sha256sum] = "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
|
||||
UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
+24
-29
@@ -1,4 +1,4 @@
|
||||
From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00 2001
|
||||
From dd5b4a200cd2fdf7fef627c4b6752f90c00b863a 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,36 +8,31 @@ Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
mesonbuild/modules/python.py | 12 ------------
|
||||
1 file changed, 12 deletions(-)
|
||||
mesonbuild/modules/python.py | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
|
||||
index 422155b..aaf5844 100644
|
||||
index f479ab9..b934bc6 100644
|
||||
--- a/mesonbuild/modules/python.py
|
||||
+++ b/mesonbuild/modules/python.py
|
||||
@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
|
||||
old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
|
||||
old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
|
||||
|
||||
- os.environ.pop('PKG_CONFIG_PATH', None)
|
||||
-
|
||||
- if pkg_libdir:
|
||||
- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
|
||||
-
|
||||
try:
|
||||
self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
|
||||
mlog.debug(f'Found "{pkg_name}" via pkgconfig lookup in LIBPC ({pkg_libdir})')
|
||||
@@ -83,13 +78,6 @@ class PythonDependency(ExternalDependency):
|
||||
mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir})')
|
||||
mlog.debug(e)
|
||||
|
||||
- if old_pkg_path is not None:
|
||||
- os.environ['PKG_CONFIG_PATH'] = old_pkg_path
|
||||
-
|
||||
- if old_pkg_libdir is not None:
|
||||
- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir
|
||||
- else:
|
||||
- os.environ.pop('PKG_CONFIG_LIBDIR', None)
|
||||
else:
|
||||
mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir}), this is likely due to a relocated python installation')
|
||||
@@ -239,10 +239,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
|
||||
# If python-X.Y.pc exists in LIBPC, we will try to use it
|
||||
def wrap_in_pythons_pc_dir(name: str, env: 'Environment', kwargs: T.Dict[str, T.Any],
|
||||
installation: 'PythonInstallation') -> 'ExternalDependency':
|
||||
- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None)
|
||||
- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None)
|
||||
- if pkg_libdir:
|
||||
- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
|
||||
try:
|
||||
return PythonPkgConfigDependency(name, env, kwargs, installation)
|
||||
finally:
|
||||
@@ -251,8 +247,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.extend([
|
||||
functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 27bbd3c9d8d86de545fcf6608564a14571c98a61 Mon Sep 17 00:00:00 2001
|
||||
From 18600f7a1cddf23aeabd188f86e66983f27ccfe3 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Fri, 23 Nov 2018 15:28:28 +0000
|
||||
Subject: [PATCH] meson: Disable rpath stripping at install time
|
||||
@@ -10,26 +10,28 @@ is a specific directive to do something differently in the project.
|
||||
RP 2018/11/23
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
|
||||
|
||||
---
|
||||
mesonbuild/minstall.py | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
|
||||
index 212568a..06366d4 100644
|
||||
index 7d0da13..17d50db 100644
|
||||
--- a/mesonbuild/minstall.py
|
||||
+++ b/mesonbuild/minstall.py
|
||||
@@ -653,8 +653,11 @@ class Installer:
|
||||
@@ -718,8 +718,11 @@ class Installer:
|
||||
if file_copied:
|
||||
self.did_install_something = True
|
||||
try:
|
||||
- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
|
||||
- install_name_mappings, verbose=False)
|
||||
- install_name_mappings, verbose=False)
|
||||
+ if install_rpath:
|
||||
+ self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
|
||||
+ install_name_mappings, verbose=False)
|
||||
+ install_name_mappings, verbose=False)
|
||||
+ else:
|
||||
+ print("RPATH changes at install time disabled")
|
||||
except SystemExit as e:
|
||||
if isinstance(e.code, int) and e.code == 0:
|
||||
pass
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user