summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-04-04 14:13:16 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:02 +0100
commitcb448f161a890d14e8429fb860cc6b30959d9699 (patch)
tree44b86ca5445d59f5b0f90a8da6f2072eea3729cc
parenta6b11646a175c4193bab642e025ab314d80c438a (diff)
downloadpoky-cb448f161a890d14e8429fb860cc6b30959d9699.tar.gz
meson: update to 0.45.1
(From OE-Core rev: 8b7e013da561838629a9f93d53dbf4d4415ee856) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch34
-rw-r--r--meta/recipes-devtools/meson/meson_0.45.1.bb (renamed from meta/recipes-devtools/meson/meson_0.44.1.bb)4
2 files changed, 18 insertions, 20 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
index 1912e94358..a00743fda8 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
@@ -1,7 +1,7 @@
1From c5692cac9c555664281377a82bf8b1e46934f437 Mon Sep 17 00:00:00 2001 1From d1c2b3bf01f1a5897cf5c906ba2326fb68c6af12 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 4 Aug 2017 16:16:41 +0300 3Date: Fri, 4 Aug 2017 16:16:41 +0300
4Subject: [PATCH 1/3] gtkdoc: fix issues that arise when cross-compiling 4Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
5 5
6Specifically: 6Specifically:
71) Make it possible to specify a wrapper for executing binaries 71) Make it possible to specify a wrapper for executing binaries
@@ -21,10 +21,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
21 2 files changed, 22 insertions(+), 5 deletions(-) 21 2 files changed, 22 insertions(+), 5 deletions(-)
22 22
23diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py 23diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
24index 56765a5..4f7fe30 100644 24index 569011e..770ff4f 100644
25--- a/mesonbuild/modules/gnome.py 25--- a/mesonbuild/modules/gnome.py
26+++ b/mesonbuild/modules/gnome.py 26+++ b/mesonbuild/modules/gnome.py
27@@ -769,6 +769,10 @@ This will become a hard error in the future.''') 27@@ -773,6 +773,10 @@ This will become a hard error in the future.''')
28 '--mode=' + mode] 28 '--mode=' + mode]
29 if namespace: 29 if namespace:
30 args.append('--namespace=' + namespace) 30 args.append('--namespace=' + namespace)
@@ -35,10 +35,10 @@ index 56765a5..4f7fe30 100644
35 args += self._unpack_args('--htmlargs=', 'html_args', kwargs) 35 args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
36 args += self._unpack_args('--scanargs=', 'scan_args', kwargs) 36 args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
37 args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs) 37 args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs)
38@@ -796,14 +800,22 @@ This will become a hard error in the future.''') 38@@ -829,14 +833,22 @@ This will become a hard error in the future.''')
39 raise MesonException(
40 'Gir include dirs should be include_directories().')
41 cflags.update(get_include_args(inc_dirs)) 39 cflags.update(get_include_args(inc_dirs))
40 cflags.update(state.environment.coredata.external_args['c'])
41 ldflags.update(state.environment.coredata.external_link_args['c'])
42+ 42+
43+ cross_c_args = " ".join(state.environment.cross_info.config["properties"].get('c_args', "")) 43+ cross_c_args = " ".join(state.environment.cross_info.config["properties"].get('c_args', ""))
44+ cross_link_args = " ".join(state.environment.cross_info.config["properties"].get('c_link_args', "")) 44+ cross_link_args = " ".join(state.environment.cross_info.config["properties"].get('c_link_args', ""))
@@ -62,26 +62,27 @@ index 56765a5..4f7fe30 100644
62 return args 62 return args
63 63
64diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py 64diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py
65index 4406b28..b846827 100644 65index 2a5ee8b..2fd692b 100644
66--- a/mesonbuild/scripts/gtkdochelper.py 66--- a/mesonbuild/scripts/gtkdochelper.py
67+++ b/mesonbuild/scripts/gtkdochelper.py 67+++ b/mesonbuild/scripts/gtkdochelper.py
68@@ -44,13 +44,14 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='') 68@@ -45,6 +45,7 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='')
69 parser.add_argument('--namespace', dest='namespace', default='') 69 parser.add_argument('--namespace', dest='namespace', default='')
70 parser.add_argument('--mode', dest='mode', default='') 70 parser.add_argument('--mode', dest='mode', default='')
71 parser.add_argument('--installdir', dest='install_dir') 71 parser.add_argument('--installdir', dest='install_dir')
72+parser.add_argument('--gtkdoc-exe-wrapper', dest='gtkdoc_exe_wrapper') 72+parser.add_argument('--gtkdoc-exe-wrapper', dest='gtkdoc_exe_wrapper')
73 73
74 def gtkdoc_run_check(cmd, cwd): 74 def gtkdoc_run_check(cmd, cwd, library_path=None):
75 # Put stderr into stdout since we want to print it out anyway. 75 env = dict(os.environ)
76@@ -54,7 +55,7 @@ def gtkdoc_run_check(cmd, cwd, library_path=None):
76 # This preserves the order of messages. 77 # This preserves the order of messages.
77 p, out = Popen_safe(cmd, cwd=cwd, stderr=subprocess.STDOUT)[0:2] 78 p, out = Popen_safe(cmd, cwd=cwd, env=env, stderr=subprocess.STDOUT)[0:2]
78 if p.returncode != 0: 79 if p.returncode != 0:
79- err_msg = ["{!r} failed with status {:d}".format(cmd[0], p.returncode)] 80- err_msg = ["{!r} failed with status {:d}".format(cmd[0], p.returncode)]
80+ err_msg = ["{!r} failed with status {:d}".format(cmd, p.returncode)] 81+ err_msg = ["{!r} failed with status {:d}".format(cmd, p.returncode)]
81 if out: 82 if out:
82 err_msg.append(out) 83 err_msg.append(out)
83 raise MesonException('\n'.join(err_msg)) 84 raise MesonException('\n'.join(err_msg))
84@@ -58,7 +59,7 @@ def gtkdoc_run_check(cmd, cwd): 85@@ -62,7 +63,7 @@ def gtkdoc_run_check(cmd, cwd, library_path=None):
85 def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, 86 def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs,
86 main_file, module, 87 main_file, module,
87 html_args, scan_args, fixxref_args, mkdb_args, 88 html_args, scan_args, fixxref_args, mkdb_args,
@@ -90,7 +91,7 @@ index 4406b28..b846827 100644
90 html_assets, content_files, ignore_headers, namespace, 91 html_assets, content_files, ignore_headers, namespace,
91 expand_content_files, mode): 92 expand_content_files, mode):
92 print("Building documentation for %s" % module) 93 print("Building documentation for %s" % module)
93@@ -111,6 +112,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, 94@@ -115,6 +116,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs,
94 if gobject_typesfile: 95 if gobject_typesfile:
95 scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile, 96 scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile,
96 '--module=' + module, 97 '--module=' + module,
@@ -100,7 +101,7 @@ index 4406b28..b846827 100644
100 '--cflags=' + cflags, 101 '--cflags=' + cflags,
101 '--ldflags=' + ldflags, 102 '--ldflags=' + ldflags,
102 '--ld=' + ld] 103 '--ld=' + ld]
103@@ -207,6 +211,7 @@ def run(args): 104@@ -219,6 +223,7 @@ def run(args):
104 mkdbargs, 105 mkdbargs,
105 options.gobject_typesfile, 106 options.gobject_typesfile,
106 scanobjsargs, 107 scanobjsargs,
@@ -108,6 +109,3 @@ index 4406b28..b846827 100644
108 options.ld, 109 options.ld,
109 options.cc, 110 options.cc,
110 options.ldflags, 111 options.ldflags,
111--
1122.15.0
113
diff --git a/meta/recipes-devtools/meson/meson_0.44.1.bb b/meta/recipes-devtools/meson/meson_0.45.1.bb
index 6a81dab265..9decdd0c24 100644
--- a/meta/recipes-devtools/meson/meson_0.44.1.bb
+++ b/meta/recipes-devtools/meson/meson_0.45.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] = "82b1198bf714b5a4da84bfe8376c79cc" 13SRC_URI[md5sum] = "4d9c7b3a7365b7b472f00af14e034949"
14SRC_URI[sha256sum] = "2ea1a721574adb23160b6481191bcc1173f374e02b0ff3bb0ae85d988d97e4fa" 14SRC_URI[sha256sum] = "4d0bb0dbb1bb556cb7a4092fdfea3d6e76606bd739a4bc97481c2d7bc6200afb"
15UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases" 15UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
16 16
17inherit setuptools3 17inherit setuptools3