@@ -1,4 +1,4 @@
-From c61c93f43b70ba0670d41e841bff9f2a7186cc2f Mon Sep 17 00:00:00 2001
+From f6076436e5de9a768488c34ca301bf52eee947af Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal
@@ -11,10 +11,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 0e9cd23..b44e60c 100644
+index 86bad9b..9703315 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
-@@ -276,8 +276,8 @@ class MachineInfo(HoldableObject):
+@@ -277,8 +277,8 @@ class MachineInfo(HoldableObject):
'but is missing {}.'.format(minimum_literal - set(literal)))
cpu_family = literal['cpu_family']
@@ -26,10 +26,10 @@ index 0e9cd23..b44e60c 100644
endian = literal['endian']
if endian not in ('little', 'big'):
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index af69f64..248d6dd 100644
+index be40dbc..630eb4d 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
-@@ -379,10 +379,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -384,10 +384,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
if compilers and not any_compiler_has_define(compilers, '__mips64'):
trial = 'mips'
@@ -1,4 +1,4 @@
-From b4c0602a56d3517ab66b98a7dbb69defe77d29a3 Mon Sep 17 00:00:00 2001
+From 786cdef7339ad865d29f92594ee7d18589b22fd2 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
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
-index b9b17f8..a305afb 100644
+index 883a29a..52bfbf3 100644
--- a/mesonbuild/dependencies/python.py
+++ b/mesonbuild/dependencies/python.py
-@@ -381,9 +381,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
+@@ -399,9 +399,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
empty.name = 'python'
return empty
@@ -24,7 +24,7 @@ index b9b17f8..a305afb 100644
try:
return PythonPkgConfigDependency(name, env, kwargs, installation, True)
finally:
-@@ -392,8 +389,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
+@@ -410,8 +407,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
os.environ[name] = value
elif name in os.environ:
del os.environ[name]
@@ -1,4 +1,4 @@
-From 7f69bfabb87d311d7409ea6699f7dee8e9b3a95b Mon Sep 17 00:00:00 2001
+From 249df6f74a8609663a79506374b9c632848e41f2 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again
@@ -12,7 +12,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
1 file changed, 1 insertion(+)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index b44e60c..c70e8cb 100644
+index 9703315..74f2477 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -28,6 +28,7 @@ from pathlib import Path
similarity index 98%
rename from meta/recipes-devtools/meson/meson_1.4.0.bb
rename to meta/recipes-devtools/meson/meson_1.5.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
file://0001-Make-CPU-family-warnings-fatal.patch \
file://0002-Support-building-allarch-recipes-again.patch \
"
-SRC_URI[sha256sum] = "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d"
+SRC_URI[sha256sum] = "45d7b8653c1e5139df35b33be2dd5b2d040c5b2c6129f9a7c890d507e33312b8"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$"
inherit python_setuptools_build_meta github-releases
- Support for `bztar` in `meson dist` - Cargo dependencies names now include the API version - Added support `Cargo.lock` file - Meson now propagates its build type to CMake - compiler.run() method is now available for all languages - dependencies created by compiler.find_library implement the `name()` method - New version_argument kwarg for find_program - Meson configure handles changes to options in more cases - New meson format command - Added support for GCC's `null_terminated_string_arg` function attribute - A new dependency for ObjFW is now supported - Support of indexed `@PLAINNAME@` and `@BASENAME@` - Required kwarg on more `compiler` methods - The Meson test program supports a new "--interactive" argument - meson test now sets the `MESON_TEST_ITERATION` environment variable - The Meson test program supports a new "--max-lines" argument - Basic support for TI Arm Clang (tiarmclang) - Support for Texas Instruments C6000 C/C++ compiler - Wayland stable protocols can be versioned Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../meson/0001-Make-CPU-family-warnings-fatal.patch | 10 +++++----- ...module-do-not-manipulate-the-environment-when.patch | 8 ++++---- .../0002-Support-building-allarch-recipes-again.patch | 4 ++-- .../meson/{meson_1.4.0.bb => meson_1.5.0.bb} | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) rename meta/recipes-devtools/meson/{meson_1.4.0.bb => meson_1.5.0.bb} (98%)