diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch | 30 |
1 files changed, 15 insertions, 15 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 a00743fda8..57cb678f2c 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,4 +1,4 @@ | |||
1 | From d1c2b3bf01f1a5897cf5c906ba2326fb68c6af12 Mon Sep 17 00:00:00 2001 | 1 | From 3ac4e58c5494bd7e603a325b5b5c2b8075849fee Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 4 Aug 2017 16:16:41 +0300 | 3 | Date: Fri, 4 Aug 2017 16:16:41 +0300 |
4 | Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling | 4 | Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling |
@@ -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 | ||
23 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py | 23 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
24 | index 569011e..770ff4f 100644 | 24 | index cb69641..727eb6a 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 | @@ -773,6 +773,10 @@ This will become a hard error in the future.''') | 27 | @@ -792,6 +792,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 569011e..770ff4f 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 | @@ -829,14 +833,22 @@ This will become a hard error in the future.''') | 38 | @@ -854,14 +858,22 @@ This will become a hard error in the future.''') |
39 | cflags.update(get_include_args(inc_dirs)) | 39 | ldflags.update(internal_ldflags) |
40 | cflags.update(state.environment.coredata.external_args['c']) | 40 | ldflags.update(state.environment.coredata.get_external_link_args('c')) |
41 | ldflags.update(state.environment.coredata.external_link_args['c']) | 41 | ldflags.update(external_ldflags) |
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,7 +62,7 @@ index 569011e..770ff4f 100644 | |||
62 | return args | 62 | return args |
63 | 63 | ||
64 | diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py | 64 | diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py |
65 | index 2a5ee8b..2fd692b 100644 | 65 | index 948dc5a..9c5bd19 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 | @@ -45,6 +45,7 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='') | 68 | @@ -45,6 +45,7 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='') |
@@ -71,9 +71,9 @@ index 2a5ee8b..2fd692b 100644 | |||
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, library_path=None): | 74 | def gtkdoc_run_check(cmd, cwd, library_paths=None): |
75 | env = dict(os.environ) | 75 | if library_paths is None: |
76 | @@ -54,7 +55,7 @@ def gtkdoc_run_check(cmd, cwd, library_path=None): | 76 | @@ -64,7 +65,7 @@ def gtkdoc_run_check(cmd, cwd, library_paths=None): |
77 | # This preserves the order of messages. | 77 | # This preserves the order of messages. |
78 | p, out = Popen_safe(cmd, cwd=cwd, env=env, stderr=subprocess.STDOUT)[0:2] | 78 | p, out = Popen_safe(cmd, cwd=cwd, env=env, stderr=subprocess.STDOUT)[0:2] |
79 | if p.returncode != 0: | 79 | if p.returncode != 0: |
@@ -82,7 +82,7 @@ index 2a5ee8b..2fd692b 100644 | |||
82 | if out: | 82 | if out: |
83 | err_msg.append(out) | 83 | err_msg.append(out) |
84 | raise MesonException('\n'.join(err_msg)) | 84 | raise MesonException('\n'.join(err_msg)) |
85 | @@ -62,7 +63,7 @@ def gtkdoc_run_check(cmd, cwd, library_path=None): | 85 | @@ -74,7 +75,7 @@ def gtkdoc_run_check(cmd, cwd, library_paths=None): |
86 | def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, | 86 | def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, |
87 | main_file, module, | 87 | main_file, module, |
88 | html_args, scan_args, fixxref_args, mkdb_args, | 88 | html_args, scan_args, fixxref_args, mkdb_args, |
@@ -91,7 +91,7 @@ index 2a5ee8b..2fd692b 100644 | |||
91 | html_assets, content_files, ignore_headers, namespace, | 91 | html_assets, content_files, ignore_headers, namespace, |
92 | expand_content_files, mode): | 92 | expand_content_files, mode): |
93 | print("Building documentation for %s" % module) | 93 | print("Building documentation for %s" % module) |
94 | @@ -115,6 +116,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, | 94 | @@ -135,6 +136,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, |
95 | if gobject_typesfile: | 95 | if gobject_typesfile: |
96 | scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile, | 96 | scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile, |
97 | '--module=' + module, | 97 | '--module=' + module, |
@@ -100,8 +100,8 @@ index 2a5ee8b..2fd692b 100644 | |||
100 | + '--ld=' + ld, | 100 | + '--ld=' + ld, |
101 | '--cflags=' + cflags, | 101 | '--cflags=' + cflags, |
102 | '--ldflags=' + ldflags, | 102 | '--ldflags=' + ldflags, |
103 | '--ld=' + ld] | 103 | '--cc=' + cc, |
104 | @@ -219,6 +223,7 @@ def run(args): | 104 | @@ -238,6 +242,7 @@ def run(args): |
105 | mkdbargs, | 105 | mkdbargs, |
106 | options.gobject_typesfile, | 106 | options.gobject_typesfile, |
107 | scanobjsargs, | 107 | scanobjsargs, |