mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

meson: upgrade 0.44.0 -> 0.44.1

Browse Source 
(From OE-Core rev: b91fd0aec7c92c07625c797f973b35b3985568b6)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2018-03-01 16:00:50 +02:00
committed by Richard Purdie
parent e923fe7dfa
commit 9b8767a667
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+17 -12
View File
@@ -1,6 +1,7 @@
From ffa72eac56558aa4171dd70ac1e9c27a07338fa2 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir
Subject: [PATCH 4/4] native_bindir
Some libraries, like QT, have pre-processors that convert their input
files into something that the cross-compiler can process. We find the
@@ -14,16 +15,17 @@ that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
mesonbuild/dependencies/base.py | 14 +++++++++-----
mesonbuild/dependencies/base.py | 16 ++++++++++------
mesonbuild/dependencies/ui.py | 6 +++---
2 files changed, 12 insertions(+), 8 deletions(-)
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 0ef33722f196..b3f7e7c06822 100644
index bf79bc5..c9fd08c 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -130,7 +130,7 @@ class Dependency:
@@ -131,7 +131,7 @@ class Dependency:
def need_threads(self):
return False
@@ -32,7 +34,7 @@ index 0ef33722f196..b3f7e7c06822 100644
raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
def get_configtool_variable(self, variable_name):
@@ -149,7 +149,7 @@ class InternalDependency(Dependency):
@@ -150,7 +150,7 @@ class InternalDependency(Dependency):
self.sources = sources
self.ext_deps = ext_deps
@@ -41,7 +43,7 @@ index 0ef33722f196..b3f7e7c06822 100644
raise DependencyException('Method "get_pkgconfig_variable()" is '
'invalid for an internal dependency')
@@ -414,10 +414,14 @@ class PkgConfigDependency(ExternalDependency):
@@ -425,10 +425,14 @@ class PkgConfigDependency(ExternalDependency):
return s.format(self.__class__.__name__, self.name, self.is_found,
self.version_reqs)
@@ -58,16 +60,16 @@ index 0ef33722f196..b3f7e7c06822 100644
return p.returncode, out.strip()
def _convert_mingw_paths(self, args):
@@ -499,7 +503,7 @@ class PkgConfigDependency(ExternalDependency):
self.is_libtool = True
self.link_args.append(lib)
@@ -522,7 +526,7 @@ class PkgConfigDependency(ExternalDependency):
# linkers such as MSVC, so prepend them.
self.link_args = ['-L' + lp for lp in libpaths] + self.link_args
- def get_pkgconfig_variable(self, variable_name, kwargs):
+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
options = ['--variable=' + variable_name, self.name]
if 'define_variable' in kwargs:
@@ -512,7 +516,7 @@ class PkgConfigDependency(ExternalDependency):
@@ -535,7 +539,7 @@ class PkgConfigDependency(ExternalDependency):
options = ['--define-variable=' + '='.join(definition)] + options
@@ -77,7 +79,7 @@ index 0ef33722f196..b3f7e7c06822 100644
if ret != 0:
if self.required:
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index 1db518c12477..4ed1d041f6f4 100644
index 1db518c..4ed1d04 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency):
@@ -107,3 +109,6 @@ index 1db518c12477..4ed1d041f6f4 100644
# There are three different ways of depending on SDL2:
--
2.15.1
meta/recipes-devtools/meson/meson_0.44.0.bb → meta/recipes-devtools/meson/meson_0.44.1.bb
+2 -2
View File
@@ -10,8 +10,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/${BP}.tar
file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
file://0003-native_bindir.patch \
"
SRC_URI[md5sum] = "26a7ca93ec9cea5facb365664261f9c6"
SRC_URI[sha256sum] = "50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b"
SRC_URI[md5sum] = "82b1198bf714b5a4da84bfe8376c79cc"
SRC_URI[sha256sum] = "2ea1a721574adb23160b6481191bcc1173f374e02b0ff3bb0ae85d988d97e4fa"
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
inherit setuptools3