summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-24 11:17:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-27 16:48:09 +0000
commit4821e629efe0ec86cef32d326c2fc5ab6515d2f6 (patch)
tree455761d449c96cd312e417fbfbeac06be77ea28d /meta/recipes-devtools
parent22dd46cc34629d0750177fddff2e1c178c854340 (diff)
downloadpoky-4821e629efe0ec86cef32d326c2fc5ab6515d2f6.tar.gz
meson: update 0.52.1 -> 0.53.0
Unset LD, and do not set ld in cross file from LD as new version of meson passes that value directly to -fuse-ld=... which requires one of lld, bfd, gold. (From OE-Core rev: e0e30637a139feb744ca284aa63d47efefc5cb5d) 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.inc4
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch12
-rw-r--r--meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch16
-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.patch16
-rw-r--r--meta/recipes-devtools/meson/meson_0.53.0.bb (renamed from meta/recipes-devtools/meson/meson_0.52.1.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb)1
7 files changed, 27 insertions, 28 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 881a14c7f0..c0ce7d338b 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
17 file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ 17 file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
18 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 18 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
19 " 19 "
20SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035" 20SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
21SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad" 21SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
22 22
23SRC_URI_append_class-native = " \ 23SRC_URI_append_class-native = " \
24 file://0001-Make-CPU-family-warnings-fatal.patch \ 24 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 d4264cee52..74d5b4ca66 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 cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001 1From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 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 29d7422..5fb00a4 100644 15index 0f277a7..24578ea 100644
16--- a/mesonbuild/envconfig.py 16--- a/mesonbuild/envconfig.py
17+++ b/mesonbuild/envconfig.py 17+++ b/mesonbuild/envconfig.py
18@@ -190,7 +190,7 @@ class MachineInfo: 18@@ -192,7 +192,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,15 +25,15 @@ index 29d7422..5fb00a4 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 a9bc2b8..b91c8da 100644 28index dc8b14f..3aab71e 100644
29--- a/mesonbuild/environment.py 29--- a/mesonbuild/environment.py
30+++ b/mesonbuild/environment.py 30+++ b/mesonbuild/environment.py
31@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: 31@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
32 trial = 'parisc' 32 trial = 'parisc'
33 33
34 if trial not in known_cpu_families: 34 if trial not in known_cpu_families:
35- mlog.warning('Unknown CPU family {!r}, please report this at ' 35- mlog.warning('Unknown CPU family {!r}, please report this at '
36- 'https://github.com/mesonbuild/meson/issues/new with the' 36- 'https://github.com/mesonbuild/meson/issues/new with the '
37- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) 37- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
38+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) 38+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
39 39
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 bf715d1e9f..eb0e90dbdd 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 @@
1From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001 1From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 19 Nov 2018 14:24:26 +0100 3Date: Mon, 19 Nov 2018 14:24:26 +0100
4Subject: [PATCH] python module: do not manipulate the environment when calling 4Subject: [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, 12 deletions(-) 12 1 file changed, 12 deletions(-)
13 13
14diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py 14diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
15index 9cfbd6f..3ff687a 100644 15index 07be318..b770603 100644
16--- a/mesonbuild/modules/python.py 16--- a/mesonbuild/modules/python.py
17+++ b/mesonbuild/modules/python.py 17+++ b/mesonbuild/modules/python.py
18@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency): 18@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
19 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') 19 old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
20 old_pkg_path = os.environ.get('PKG_CONFIG_PATH') 20 old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
21 21
@@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
25- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir 25- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
26- 26-
27 try: 27 try:
28 self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) 28 self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
29 mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir)) 29 mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
30@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency): 30@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
31 mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir)) 31 mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
32 mlog.debug(e) 32 mlog.debug(e)
33 33
34- if old_pkg_path is not None: 34- if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
39- else: 39- else:
40- os.environ.pop('PKG_CONFIG_LIBDIR', None) 40- os.environ.pop('PKG_CONFIG_LIBDIR', None)
41 else: 41 else:
42 mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir)) 42 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
43 43
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 c8c7b298de..1529ebe9fe 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 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001 1From cc6e47da801ce3c274485775c62784416fd22977 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,7 +13,7 @@ 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 5fb00a4..f5702ba 100644 16index 24578ea..216e71f 100644
17--- a/mesonbuild/envconfig.py 17--- a/mesonbuild/envconfig.py
18+++ b/mesonbuild/envconfig.py 18+++ b/mesonbuild/envconfig.py
19@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T') 19@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
22 known_cpu_families = ( 22 known_cpu_families = (
23+ 'allarch', 23+ 'allarch',
24 'aarch64', 24 'aarch64',
25 'alpha',
25 'arc', 26 'arc',
26 'arm',
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 14a9a13666..76c1aa9ac1 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 baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001 1From af2554b9b08af973181b4e4181bd1cb936fdbb8f 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
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
22 2 files changed, 14 insertions(+), 11 deletions(-) 22 2 files changed, 14 insertions(+), 11 deletions(-)
23 23
24diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py 24diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
25index 35f0175..b39cba6 100644 25index f17b9f2..b5c9c92 100644
26--- a/mesonbuild/dependencies/base.py 26--- a/mesonbuild/dependencies/base.py
27+++ b/mesonbuild/dependencies/base.py 27+++ b/mesonbuild/dependencies/base.py
28@@ -184,7 +184,7 @@ class Dependency: 28@@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
43 raise DependencyException('Method "get_pkgconfig_variable()" is ' 43 raise DependencyException('Method "get_pkgconfig_variable()" is '
44 'invalid for an internal dependency') 44 'invalid for an internal dependency')
45 45
46@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency): 46@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
47 return s.format(self.__class__.__name__, self.name, self.is_found, 47 return s.format(self.__class__.__name__, self.name, self.is_found,
48 self.version_reqs) 48 self.version_reqs)
49 49
@@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
65 # Always copy the environment since we're going to modify it 65 # Always copy the environment since we're going to modify it
66 # with pkg-config variables 66 # with pkg-config variables
67 if env is None: 67 if env is None:
68@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency): 68@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
69 targs = tuple(args) 69 targs = tuple(args)
70 cache = PkgConfigDependency.pkgbin_cache 70 cache = PkgConfigDependency.pkgbin_cache
71 if (self.pkgbin, targs, fenv) not in cache: 71 if (self.pkgbin, targs, fenv) not in cache:
@@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
73+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) 73+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
74 return cache[(self.pkgbin, targs, fenv)] 74 return cache[(self.pkgbin, targs, fenv)]
75 75
76 def _convert_mingw_paths(self, args): 76 def _convert_mingw_paths(self, args: List[str]) -> List[str]:
77@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency): 77@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
78 (self.name, out_raw)) 78 (self.name, out_raw))
79 self.link_args, self.raw_link_args = self._search_libs(out, out_raw) 79 self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
80 80
@@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
83 options = ['--variable=' + variable_name, self.name] 83 options = ['--variable=' + variable_name, self.name]
84 84
85 if 'define_variable' in kwargs: 85 if 'define_variable' in kwargs:
86@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency): 86@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
87 87
88 options = ['--define-variable=' + '='.join(definition)] + options 88 options = ['--define-variable=' + '='.join(definition)] + options
89 89
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
93 if ret != 0: 93 if ret != 0:
94 if self.required: 94 if self.required:
95diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py 95diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
96index 6d784e6..73a9e13 100644 96index bdcc4a7..e2de847 100644
97--- a/mesonbuild/dependencies/ui.py 97--- a/mesonbuild/dependencies/ui.py
98+++ b/mesonbuild/dependencies/ui.py 98+++ b/mesonbuild/dependencies/ui.py
99@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): 99@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
diff --git a/meta/recipes-devtools/meson/meson_0.52.1.bb b/meta/recipes-devtools/meson/meson_0.53.0.bb
index de9b905c12..de9b905c12 100644
--- a/meta/recipes-devtools/meson/meson_0.52.1.bb
+++ b/meta/recipes-devtools/meson/meson_0.53.0.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
index 1756f342ce..67add2c25e 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
@@ -31,7 +31,6 @@ c = @CC
31cpp = @CXX 31cpp = @CXX
32ar = @AR 32ar = @AR
33nm = @NM 33nm = @NM
34ld = @LD
35strip = @STRIP 34strip = @STRIP
36pkgconfig = 'pkg-config' 35pkgconfig = 'pkg-config'
37 36