mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

meson: update 0.52.1 -> 0.53.0

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2020-01-24 11:17:20 +01:00
committed by Richard Purdie
parent 22dd46cc34
commit 4821e629ef
8 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/meson.bbclass
+4 -1
View File
@@ -91,7 +91,6 @@ c = ${@meson_array('CC', d)}
cpp = ${@meson_array('CXX', d)} cpp = ${@meson_array('CXX', d)}
ar = ${@meson_array('AR', d)} ar = ${@meson_array('AR', d)}
nm = ${@meson_array('NM', d)} nm = ${@meson_array('NM', d)}
ld = ${@meson_array('LD', d)}
strip = ${@meson_array('STRIP', d)} strip = ${@meson_array('STRIP', d)}
readelf = ${@meson_array('READELF', d)} readelf = ${@meson_array('READELF', d)}
pkgconfig = 'pkg-config' pkgconfig = 'pkg-config'
@@ -122,6 +121,10 @@ EOF
CONFIGURE_FILES = "meson.build" CONFIGURE_FILES = "meson.build"
meson_do_configure() { meson_do_configure() {
# Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
# https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
unset LD
# Work around "Meson fails if /tmp is mounted with noexec #2972" # Work around "Meson fails if /tmp is mounted with noexec #2972"
mkdir -p "${B}/meson-private/tmp" mkdir -p "${B}/meson-private/tmp"
export TMPDIR="${B}/meson-private/tmp" export TMPDIR="${B}/meson-private/tmp"
meta/recipes-devtools/meson/meson.inc
+2 -2
View File
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
" "
SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035" SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad" SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
SRC_URI_append_class-native = " \ SRC_URI_append_class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+6 -6
View File
@@ -1,4 +1,4 @@
From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001 From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com> From: Ross Burton <ross.burton@intel.com>
Date: Tue, 3 Jul 2018 13:59:09 +0100 Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
2 files changed, 2 insertions(+), 4 deletions(-) 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index 29d7422..5fb00a4 100644 index 0f277a7..24578ea 100644
--- a/mesonbuild/envconfig.py --- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py
@@ -190,7 +190,7 @@ class MachineInfo: @@ -192,7 +192,7 @@ class MachineInfo:
cpu_family = literal['cpu_family'] cpu_family = literal['cpu_family']
if cpu_family not in known_cpu_families: if cpu_family not in known_cpu_families:
@@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
endian = literal['endian'] endian = literal['endian']
if endian not in ('little', 'big'): if endian not in ('little', 'big'):
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index a9bc2b8..b91c8da 100644 index dc8b14f..3aab71e 100644
--- a/mesonbuild/environment.py --- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py +++ b/mesonbuild/environment.py
@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: @@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'parisc' trial = 'parisc'
if trial not in known_cpu_families: if trial not in known_cpu_families:
- mlog.warning('Unknown CPU family {!r}, please report this at ' - mlog.warning('Unknown CPU family {!r}, please report this at '
- 'https://github.com/mesonbuild/meson/issues/new with the' - 'https://github.com/mesonbuild/meson/issues/new with the '
- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) - 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
+8 -8
View File
@@ -1,4 +1,4 @@
From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001 From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 19 Nov 2018 14:24:26 +0100 Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 12 deletions(-) 1 file changed, 12 deletions(-)
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index 9cfbd6f..3ff687a 100644 index 07be318..b770603 100644
--- a/mesonbuild/modules/python.py --- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py
@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency): @@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
old_pkg_path = os.environ.get('PKG_CONFIG_PATH') old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
@@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir - os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
- -
try: try:
self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir)) mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency): @@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir)) mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
mlog.debug(e) mlog.debug(e)
- if old_pkg_path is not None: - if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
- else: - else:
- os.environ.pop('PKG_CONFIG_LIBDIR', None) - os.environ.pop('PKG_CONFIG_LIBDIR', None)
else: else:
mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir)) mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001 From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com> From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200 Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index 5fb00a4..f5702ba 100644 index 24578ea..216e71f 100644
--- a/mesonbuild/envconfig.py --- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py
@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T') @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
known_cpu_families = ( known_cpu_families = (
+ 'allarch', + 'allarch',
'aarch64', 'aarch64',
'alpha',
'arc', 'arc',
'arm',
meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+8 -8
View File
@@ -1,4 +1,4 @@
From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001 From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Wed, 15 Nov 2017 15:05:01 +0100 Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
2 files changed, 14 insertions(+), 11 deletions(-) 2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 35f0175..b39cba6 100644 index f17b9f2..b5c9c92 100644
--- a/mesonbuild/dependencies/base.py --- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py
@@ -184,7 +184,7 @@ class Dependency: @@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
raise DependencyException('Method "get_pkgconfig_variable()" is ' raise DependencyException('Method "get_pkgconfig_variable()" is '
'invalid for an internal dependency') 'invalid for an internal dependency')
@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency): @@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
return s.format(self.__class__.__name__, self.name, self.is_found, return s.format(self.__class__.__name__, self.name, self.is_found,
self.version_reqs) self.version_reqs)
@@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
# Always copy the environment since we're going to modify it # Always copy the environment since we're going to modify it
# with pkg-config variables # with pkg-config variables
if env is None: if env is None:
@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency): @@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
targs = tuple(args) targs = tuple(args)
cache = PkgConfigDependency.pkgbin_cache cache = PkgConfigDependency.pkgbin_cache
if (self.pkgbin, targs, fenv) not in cache: if (self.pkgbin, targs, fenv) not in cache:
@@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
return cache[(self.pkgbin, targs, fenv)] return cache[(self.pkgbin, targs, fenv)]
def _convert_mingw_paths(self, args): def _convert_mingw_paths(self, args: List[str]) -> List[str]:
@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency): @@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
(self.name, out_raw)) (self.name, out_raw))
self.link_args, self.raw_link_args = self._search_libs(out, out_raw) self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
@@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
options = ['--variable=' + variable_name, self.name] options = ['--variable=' + variable_name, self.name]
if 'define_variable' in kwargs: if 'define_variable' in kwargs:
@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency): @@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
options = ['--define-variable=' + '='.join(definition)] + options options = ['--define-variable=' + '='.join(definition)] + options
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
if ret != 0: if ret != 0:
if self.required: if self.required:
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index 6d784e6..73a9e13 100644 index bdcc4a7..e2de847 100644
--- a/mesonbuild/dependencies/ui.py --- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py
@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
meta/recipes-devtools/meson/meson_0.52.1.bb → meta/recipes-devtools/meson/meson_0.53.0.bb
View File
meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb → meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
-1
View File
@@ -31,7 +31,6 @@ c = @CC
cpp = @CXX cpp = @CXX
ar = @AR ar = @AR
nm = @NM nm = @NM
ld = @LD
strip = @STRIP strip = @STRIP
pkgconfig = 'pkg-config' pkgconfig = 'pkg-config'