summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-02-28 16:36:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-02 14:15:33 +0000
commit02f2ecabc3007a143f7b9b278820c7981ecee99a (patch)
treef114272baef1a7b546d8e5ac6f40ee8849d378b1 /meta/recipes-devtools
parentecabf7386fce5f1af93215b7c3b47291e4d63cb3 (diff)
downloadpoky-02f2ecabc3007a143f7b9b278820c7981ecee99a.tar.gz
meson: update 0.56.2 -> 0.57.1
Replace hacky 0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch with entries in meson.cross. Rest of the patches are refreshed. (From OE-Core rev: 85b4aea551ac4a0f47f916957dd9707c81813a2b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/meson/meson.inc3
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch10
-rw-r--r--meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch37
-rw-r--r--meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch14
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch6
-rw-r--r--meta/recipes-devtools/meson/meson/0003-native_bindir.patch27
-rw-r--r--meta/recipes-devtools/meson/meson/disable-rpath-handling.patch12
-rw-r--r--meta/recipes-devtools/meson/meson_0.57.1.bb (renamed from meta/recipes-devtools/meson/meson_0.56.2.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb)0
9 files changed, 34 insertions, 75 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index d0ebec9911..622c22affd 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -14,9 +14,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
14 file://disable-rpath-handling.patch \ 14 file://disable-rpath-handling.patch \
15 file://cross-prop-default.patch \ 15 file://cross-prop-default.patch \
16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
17 file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
18 " 17 "
19SRC_URI[sha256sum] = "3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4" 18SRC_URI[sha256sum] = "72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6"
20 19
21SRC_URI_append_class-native = " \ 20SRC_URI_append_class-native = " \
22 file://0001-Make-CPU-family-warnings-fatal.patch \ 21 file://0001-Make-CPU-family-warnings-fatal.patch \
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 edd262df5a..0808891a27 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 @@
1From 248d17b7221e7ebc9d84154eac11ae4ebb5189ab Mon Sep 17 00:00:00 2001 1From 76934bcbf2cfa7304e8864e28c51f58adda0392f Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 3 Jul 2018 13:59:09 +0100 3Date: Tue, 3 Jul 2018 13:59:09 +0100
4Subject: [PATCH] Make CPU family warnings fatal 4Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
12 2 files changed, 2 insertions(+), 4 deletions(-) 12 2 files changed, 2 insertions(+), 4 deletions(-)
13 13
14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py 14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
15index 13d0ba5..5ba3a1a 100644 15index ba35d16..2d3c34c 100644
16--- a/mesonbuild/envconfig.py 16--- a/mesonbuild/envconfig.py
17+++ b/mesonbuild/envconfig.py 17+++ b/mesonbuild/envconfig.py
18@@ -254,7 +254,7 @@ class MachineInfo: 18@@ -262,7 +262,7 @@ class MachineInfo:
19 19
20 cpu_family = literal['cpu_family'] 20 cpu_family = literal['cpu_family']
21 if cpu_family not in known_cpu_families: 21 if cpu_family not in known_cpu_families:
@@ -25,10 +25,10 @@ index 13d0ba5..5ba3a1a 100644
25 endian = literal['endian'] 25 endian = literal['endian']
26 if endian not in ('little', 'big'): 26 if endian not in ('little', 'big'):
27diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py 27diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
28index 588005b..988e3ea 100644 28index 756dd81..4d2c2b6 100644
29--- a/mesonbuild/environment.py 29--- a/mesonbuild/environment.py
30+++ b/mesonbuild/environment.py 30+++ b/mesonbuild/environment.py
31@@ -400,9 +400,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: 31@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
32 trial = 'ppc64' 32 trial = 'ppc64'
33 33
34 if trial not in known_cpu_families: 34 if trial not in known_cpu_families:
diff --git a/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch b/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
deleted file mode 100644
index a1f8422d44..0000000000
--- a/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 27 May 2020 16:43:05 +0000
4Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR
5
6When using sysroots for builds, the standard target paths for the
7tools need to be prefixed (pkg-config is not clever enough to
8determine when a custom variable is a path)
9
10Upstream-Status: Pending
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
14 mesonbuild/modules/gnome.py | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
18index 52016f4..2b72ee4 100644
19--- a/mesonbuild/modules/gnome.py
20+++ b/mesonbuild/modules/gnome.py
21@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule):
22 if giscanner is not None:
23 self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner)
24 elif self.gir_dep.type_name == 'pkgconfig':
25- self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
26+ self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
27 else:
28 self.giscanner = self.interpreter.find_program_impl('g-ir-scanner')
29 gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler')
30 if gicompiler is not None:
31 self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler)
32 elif self.gir_dep.type_name == 'pkgconfig':
33- self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
34+ self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
35 else:
36 self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
37 return self.gir_dep, self.giscanner, self.gicompiler
diff --git a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
index c0ad01e9d3..231414fcb6 100644
--- a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
+++ b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
@@ -1,4 +1,4 @@
1From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001 1From f8f67c8d5c3f374b1e30e2d40cb56a79f0544471 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 18 Apr 2019 17:36:11 +0200 3Date: Thu, 18 Apr 2019 17:36:11 +0200
4Subject: [PATCH] modules/python.py: do not substitute python's install prefix 4Subject: [PATCH] modules/python.py: do not substitute python's install prefix
@@ -12,11 +12,11 @@ Upstream-Status: Pending
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 13
14--- 14---
15 mesonbuild/modules/python.py | 7 +++---- 15 mesonbuild/modules/python.py | 6 +++---
16 1 file changed, 3 insertions(+), 4 deletions(-) 16 1 file changed, 3 insertions(+), 3 deletions(-)
17 17
18diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py 18diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
19index 2f0c644..d2aa565 100644 19index eda70ce..18edd15 100644
20--- a/mesonbuild/modules/python.py 20--- a/mesonbuild/modules/python.py
21+++ b/mesonbuild/modules/python.py 21+++ b/mesonbuild/modules/python.py
22@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig 22@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
@@ -28,11 +28,7 @@ index 2f0c644..d2aa565 100644
28 28
29 def links_against_libpython(): 29 def links_against_libpython():
30 from distutils.core import Distribution, Extension 30 from distutils.core import Distribution, Extension
31@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder): 31@@ -280,8 +280,8 @@ class PythonInstallation(ExternalProgramHolder):
32 ExternalProgramHolder.__init__(self, python, interpreter.subproject)
33 self.interpreter = interpreter
34 self.subproject = self.interpreter.subproject
35- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
36 self.variables = info['variables'] 32 self.variables = info['variables']
37 self.paths = info['paths'] 33 self.paths = info['paths']
38 install_paths = info['install_paths'] 34 install_paths = info['install_paths']
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 2bbd2c149c..ddc34c2f49 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 @@
1From 3c0d3d1a32d4a66aa0b7ab9af3e975243855a1db Mon Sep 17 00:00:00 2001 1From 6efb6114836fd4a1e012aa03b37f3beeeb22b466 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com> 2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Thu, 26 Jul 2018 16:32:49 +0200 3Date: Thu, 26 Jul 2018 16:32:49 +0200
4Subject: [PATCH] Support building allarch recipes again 4Subject: [PATCH] Support building allarch recipes again
@@ -13,10 +13,10 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
13 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
14 14
15diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py 15diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
16index 5ba3a1a..0bf4969 100644 16index 2d3c34c..b9e7908 100644
17--- a/mesonbuild/envconfig.py 17--- a/mesonbuild/envconfig.py
18+++ b/mesonbuild/envconfig.py 18+++ b/mesonbuild/envconfig.py
19@@ -38,6 +38,7 @@ _T = T.TypeVar('_T') 19@@ -36,6 +36,7 @@ from pathlib import Path
20 20
21 21
22 known_cpu_families = ( 22 known_cpu_families = (
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index fb55a05187..ed85116c4f 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,4 +1,4 @@
1From cbc27ee1576b4d04ad8e9d80760c63a9d3b7f5ed Mon Sep 17 00:00:00 2001 1From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00 2001
2From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 2From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
3Date: Wed, 15 Nov 2017 15:05:01 +0100 3Date: Wed, 15 Nov 2017 15:05:01 +0100
4Subject: [PATCH] native_bindir 4Subject: [PATCH] native_bindir
@@ -15,16 +15,17 @@ that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment
15 15
16Upstream-Status: Inappropriate [OE specific] 16Upstream-Status: Inappropriate [OE specific]
17Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 17Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
18
18--- 19---
19 mesonbuild/dependencies/base.py | 19 +++++++++++-------- 20 mesonbuild/dependencies/base.py | 19 +++++++++++--------
20 mesonbuild/dependencies/ui.py | 6 +++--- 21 mesonbuild/dependencies/ui.py | 6 +++---
21 2 files changed, 14 insertions(+), 11 deletions(-) 22 2 files changed, 14 insertions(+), 11 deletions(-)
22 23
23diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py 24diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
24index 3a5f5f8..0af89f8 100644 25index cd77b4b..7e3f338 100644
25--- a/mesonbuild/dependencies/base.py 26--- a/mesonbuild/dependencies/base.py
26+++ b/mesonbuild/dependencies/base.py 27+++ b/mesonbuild/dependencies/base.py
27@@ -183,7 +183,7 @@ class Dependency: 28@@ -192,7 +192,7 @@ class Dependency:
28 def get_exe_args(self, compiler): 29 def get_exe_args(self, compiler):
29 return [] 30 return []
30 31
@@ -33,16 +34,16 @@ index 3a5f5f8..0af89f8 100644
33 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) 34 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
34 35
35 def get_configtool_variable(self, variable_name): 36 def get_configtool_variable(self, variable_name):
36@@ -261,7 +261,7 @@ class InternalDependency(Dependency): 37@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
37 setattr(result, k, copy.deepcopy(v, memo)) 38 return True
38 return result 39 return any(d.is_built() for d in self.ext_deps)
39 40
40- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: 41- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str:
41+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: 42+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str:
42 raise DependencyException('Method "get_pkgconfig_variable()" is ' 43 raise DependencyException('Method "get_pkgconfig_variable()" is '
43 'invalid for an internal dependency') 44 'invalid for an internal dependency')
44 45
45@@ -639,8 +639,11 @@ class PkgConfigDependency(ExternalDependency): 46@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
46 return s.format(self.__class__.__name__, self.name, self.is_found, 47 return s.format(self.__class__.__name__, self.name, self.is_found,
47 self.version_reqs) 48 self.version_reqs)
48 49
@@ -56,16 +57,16 @@ index 3a5f5f8..0af89f8 100644
56 p, out, err = Popen_safe(cmd, env=env) 57 p, out, err = Popen_safe(cmd, env=env)
57 rc, out, err = p.returncode, out.strip(), err.strip() 58 rc, out, err = p.returncode, out.strip(), err.strip()
58 call = ' '.join(cmd) 59 call = ' '.join(cmd)
59@@ -666,7 +669,7 @@ class PkgConfigDependency(ExternalDependency): 60@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
61 env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
60 mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) 62 mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
61 63
62
63- def _call_pkgbin(self, args, env=None): 64- def _call_pkgbin(self, args, env=None):
64+ def _call_pkgbin(self, args, env=None, use_native=False): 65+ def _call_pkgbin(self, args, env=None, use_native=False):
65 # Always copy the environment since we're going to modify it 66 # Always copy the environment since we're going to modify it
66 # with pkg-config variables 67 # with pkg-config variables
67 if env is None: 68 if env is None:
68@@ -680,7 +683,7 @@ class PkgConfigDependency(ExternalDependency): 69@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
69 targs = tuple(args) 70 targs = tuple(args)
70 cache = PkgConfigDependency.pkgbin_cache 71 cache = PkgConfigDependency.pkgbin_cache
71 if (self.pkgbin, targs, fenv) not in cache: 72 if (self.pkgbin, targs, fenv) not in cache:
@@ -74,7 +75,7 @@ index 3a5f5f8..0af89f8 100644
74 return cache[(self.pkgbin, targs, fenv)] 75 return cache[(self.pkgbin, targs, fenv)]
75 76
76 def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: 77 def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
77@@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency): 78@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
78 (self.name, out_raw)) 79 (self.name, out_raw))
79 self.link_args, self.raw_link_args = self._search_libs(out, out_raw) 80 self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
80 81
@@ -83,7 +84,7 @@ index 3a5f5f8..0af89f8 100644
83 options = ['--variable=' + variable_name, self.name] 84 options = ['--variable=' + variable_name, self.name]
84 85
85 if 'define_variable' in kwargs: 86 if 'define_variable' in kwargs:
86@@ -902,7 +905,7 @@ class PkgConfigDependency(ExternalDependency): 87@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
87 88
88 options = ['--define-variable=' + '='.join(definition)] + options 89 options = ['--define-variable=' + '='.join(definition)] + options
89 90
@@ -93,7 +94,7 @@ index 3a5f5f8..0af89f8 100644
93 if ret != 0: 94 if ret != 0:
94 if self.required: 95 if self.required:
95diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py 96diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
96index 5dffd3a..fb3a178 100644 97index d897d76..a598d2e 100644
97--- a/mesonbuild/dependencies/ui.py 98--- a/mesonbuild/dependencies/ui.py
98+++ b/mesonbuild/dependencies/ui.py 99+++ b/mesonbuild/dependencies/ui.py
99@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency): 100@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
index 4653a72a20..7c766c61b0 100644
--- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
+++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
@@ -1,4 +1,4 @@
1From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001 1From 27bbd3c9d8d86de545fcf6608564a14571c98a61 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 23 Nov 2018 15:28:28 +0000 3Date: Fri, 23 Nov 2018 15:28:28 +0000
4Subject: [PATCH] meson: Disable rpath stripping at install time 4Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
16 1 file changed, 5 insertions(+), 2 deletions(-) 16 1 file changed, 5 insertions(+), 2 deletions(-)
17 17
18diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py 18diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
19index 0be01fe..5406cab 100644 19index 212568a..06366d4 100644
20--- a/mesonbuild/minstall.py 20--- a/mesonbuild/minstall.py
21+++ b/mesonbuild/minstall.py 21+++ b/mesonbuild/minstall.py
22@@ -512,8 +512,11 @@ class Installer: 22@@ -653,8 +653,11 @@ class Installer:
23 if file_copied: 23 if file_copied:
24 self.did_install_something = True 24 self.did_install_something = True
25 try: 25 try:
26- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, 26- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
27- install_name_mappings, verbose=False) 27- install_name_mappings, verbose=False)
28+ if install_rpath: 28+ if install_rpath:
29+ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, 29+ self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
30+ install_name_mappings, verbose=False) 30+ install_name_mappings, verbose=False)
31+ else: 31+ else:
32+ print("RPATH changes at install time disabled") 32+ print("RPATH changes at install time disabled")
diff --git a/meta/recipes-devtools/meson/meson_0.56.2.bb b/meta/recipes-devtools/meson/meson_0.57.1.bb
index de9b905c12..de9b905c12 100644
--- a/meta/recipes-devtools/meson/meson_0.56.2.bb
+++ b/meta/recipes-devtools/meson/meson_0.57.1.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb
index 8778cab124..8778cab124 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.56.2.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.57.1.bb