summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-01 16:00:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 11:35:41 +0000
commit9b8767a667e5394c52d670c4d69d45f6b315374b (patch)
tree6c0d1cac73fcc0f3c040d290df88e031819e75f0 /meta
parente923fe7dfac4b85a2f1f7b422035b7342de32db6 (diff)
downloadpoky-9b8767a667e5394c52d670c4d69d45f6b315374b.tar.gz
meson: upgrade 0.44.0 -> 0.44.1
(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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/meson/meson/0003-native_bindir.patch29
-rw-r--r--meta/recipes-devtools/meson/meson_0.44.1.bb (renamed from meta/recipes-devtools/meson/meson_0.44.0.bb)4
2 files changed, 19 insertions, 14 deletions
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 8911dd6b34..af5e6a190b 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,6 +1,7 @@
1From ffa72eac56558aa4171dd70ac1e9c27a07338fa2 Mon Sep 17 00:00:00 2001
1From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 2From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
2Date: Wed, 15 Nov 2017 15:05:01 +0100 3Date: Wed, 15 Nov 2017 15:05:01 +0100
3Subject: [PATCH] native_bindir 4Subject: [PATCH 4/4] native_bindir
4 5
5Some libraries, like QT, have pre-processors that convert their input 6Some libraries, like QT, have pre-processors that convert their input
6files into something that the cross-compiler can process. We find the 7files 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
14 15
15Upstream-Status: Inappropriate [OE specific] 16Upstream-Status: Inappropriate [OE specific]
16Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 17Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
18
17--- 19---
18 mesonbuild/dependencies/base.py | 14 +++++++++----- 20 mesonbuild/dependencies/base.py | 16 ++++++++++------
19 mesonbuild/dependencies/ui.py | 6 +++--- 21 mesonbuild/dependencies/ui.py | 6 +++---
20 2 files changed, 12 insertions(+), 8 deletions(-) 22 2 files changed, 13 insertions(+), 9 deletions(-)
21 23
22diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py 24diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
23index 0ef33722f196..b3f7e7c06822 100644 25index bf79bc5..c9fd08c 100644
24--- a/mesonbuild/dependencies/base.py 26--- a/mesonbuild/dependencies/base.py
25+++ b/mesonbuild/dependencies/base.py 27+++ b/mesonbuild/dependencies/base.py
26@@ -130,7 +130,7 @@ class Dependency: 28@@ -131,7 +131,7 @@ class Dependency:
27 def need_threads(self): 29 def need_threads(self):
28 return False 30 return False
29 31
@@ -32,7 +34,7 @@ index 0ef33722f196..b3f7e7c06822 100644
32 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) 34 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
33 35
34 def get_configtool_variable(self, variable_name): 36 def get_configtool_variable(self, variable_name):
35@@ -149,7 +149,7 @@ class InternalDependency(Dependency): 37@@ -150,7 +150,7 @@ class InternalDependency(Dependency):
36 self.sources = sources 38 self.sources = sources
37 self.ext_deps = ext_deps 39 self.ext_deps = ext_deps
38 40
@@ -41,7 +43,7 @@ index 0ef33722f196..b3f7e7c06822 100644
41 raise DependencyException('Method "get_pkgconfig_variable()" is ' 43 raise DependencyException('Method "get_pkgconfig_variable()" is '
42 'invalid for an internal dependency') 44 'invalid for an internal dependency')
43 45
44@@ -414,10 +414,14 @@ class PkgConfigDependency(ExternalDependency): 46@@ -425,10 +425,14 @@ class PkgConfigDependency(ExternalDependency):
45 return s.format(self.__class__.__name__, self.name, self.is_found, 47 return s.format(self.__class__.__name__, self.name, self.is_found,
46 self.version_reqs) 48 self.version_reqs)
47 49
@@ -58,16 +60,16 @@ index 0ef33722f196..b3f7e7c06822 100644
58 return p.returncode, out.strip() 60 return p.returncode, out.strip()
59 61
60 def _convert_mingw_paths(self, args): 62 def _convert_mingw_paths(self, args):
61@@ -499,7 +503,7 @@ class PkgConfigDependency(ExternalDependency): 63@@ -522,7 +526,7 @@ class PkgConfigDependency(ExternalDependency):
62 self.is_libtool = True 64 # linkers such as MSVC, so prepend them.
63 self.link_args.append(lib) 65 self.link_args = ['-L' + lp for lp in libpaths] + self.link_args
64 66
65- def get_pkgconfig_variable(self, variable_name, kwargs): 67- def get_pkgconfig_variable(self, variable_name, kwargs):
66+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): 68+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
67 options = ['--variable=' + variable_name, self.name] 69 options = ['--variable=' + variable_name, self.name]
68 70
69 if 'define_variable' in kwargs: 71 if 'define_variable' in kwargs:
70@@ -512,7 +516,7 @@ class PkgConfigDependency(ExternalDependency): 72@@ -535,7 +539,7 @@ class PkgConfigDependency(ExternalDependency):
71 73
72 options = ['--define-variable=' + '='.join(definition)] + options 74 options = ['--define-variable=' + '='.join(definition)] + options
73 75
@@ -77,7 +79,7 @@ index 0ef33722f196..b3f7e7c06822 100644
77 if ret != 0: 79 if ret != 0:
78 if self.required: 80 if self.required:
79diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py 81diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
80index 1db518c12477..4ed1d041f6f4 100644 82index 1db518c..4ed1d04 100644
81--- a/mesonbuild/dependencies/ui.py 83--- a/mesonbuild/dependencies/ui.py
82+++ b/mesonbuild/dependencies/ui.py 84+++ b/mesonbuild/dependencies/ui.py
83@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency): 85@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency):
@@ -107,3 +109,6 @@ index 1db518c12477..4ed1d041f6f4 100644
107 109
108 110
109 # There are three different ways of depending on SDL2: 111 # There are three different ways of depending on SDL2:
112--
1132.15.1
114
diff --git a/meta/recipes-devtools/meson/meson_0.44.0.bb b/meta/recipes-devtools/meson/meson_0.44.1.bb
index d9c691c7f8..6a81dab265 100644
--- a/meta/recipes-devtools/meson/meson_0.44.0.bb
+++ b/meta/recipes-devtools/meson/meson_0.44.1.bb
@@ -10,8 +10,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/${BP}.tar
10 file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \ 10 file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
11 file://0003-native_bindir.patch \ 11 file://0003-native_bindir.patch \
12 " 12 "
13SRC_URI[md5sum] = "26a7ca93ec9cea5facb365664261f9c6" 13SRC_URI[md5sum] = "82b1198bf714b5a4da84bfe8376c79cc"
14SRC_URI[sha256sum] = "50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b" 14SRC_URI[sha256sum] = "2ea1a721574adb23160b6481191bcc1173f374e02b0ff3bb0ae85d988d97e4fa"
15UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" 15UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
16 16
17inherit setuptools3 17inherit setuptools3