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 @@ -From d1c2b3bf01f1a5897cf5c906ba2326fb68c6af12 Mon Sep 17 00:00:00 2001 +From 3ac4e58c5494bd7e603a325b5b5c2b8075849fee Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 4 Aug 2017 16:16:41 +0300 Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ -21,10 +21,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 569011e..770ff4f 100644 +index cb69641..727eb6a 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -773,6 +773,10 @@ This will become a hard error in the future.''') +@@ -792,6 +792,10 @@ This will become a hard error in the future.''') '--mode=' + mode] if namespace: args.append('--namespace=' + namespace) @@ -35,10 +35,10 @@ index 569011e..770ff4f 100644 args += self._unpack_args('--htmlargs=', 'html_args', kwargs) args += self._unpack_args('--scanargs=', 'scan_args', kwargs) args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs) -@@ -829,14 +833,22 @@ This will become a hard error in the future.''') - cflags.update(get_include_args(inc_dirs)) - cflags.update(state.environment.coredata.external_args['c']) - ldflags.update(state.environment.coredata.external_link_args['c']) +@@ -854,14 +858,22 @@ This will become a hard error in the future.''') + ldflags.update(internal_ldflags) + ldflags.update(state.environment.coredata.get_external_link_args('c')) + ldflags.update(external_ldflags) + + cross_c_args = " ".join(state.environment.cross_info.config["properties"].get('c_args', "")) + cross_link_args = " ".join(state.environment.cross_info.config["properties"].get('c_link_args', "")) @@ -62,7 +62,7 @@ index 569011e..770ff4f 100644 return args diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py -index 2a5ee8b..2fd692b 100644 +index 948dc5a..9c5bd19 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -45,6 +45,7 @@ parser.add_argument('--ignore-headers', dest='ignore_headers', default='') @@ -71,9 +71,9 @@ index 2a5ee8b..2fd692b 100644 parser.add_argument('--installdir', dest='install_dir') +parser.add_argument('--gtkdoc-exe-wrapper', dest='gtkdoc_exe_wrapper') - def gtkdoc_run_check(cmd, cwd, library_path=None): - env = dict(os.environ) -@@ -54,7 +55,7 @@ def gtkdoc_run_check(cmd, cwd, library_path=None): + def gtkdoc_run_check(cmd, cwd, library_paths=None): + if library_paths is None: +@@ -64,7 +65,7 @@ def gtkdoc_run_check(cmd, cwd, library_paths=None): # This preserves the order of messages. p, out = Popen_safe(cmd, cwd=cwd, env=env, stderr=subprocess.STDOUT)[0:2] if p.returncode != 0: @@ -82,7 +82,7 @@ index 2a5ee8b..2fd692b 100644 if out: err_msg.append(out) raise MesonException('\n'.join(err_msg)) -@@ -62,7 +63,7 @@ def gtkdoc_run_check(cmd, cwd, library_path=None): +@@ -74,7 +75,7 @@ def gtkdoc_run_check(cmd, cwd, library_paths=None): def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, main_file, module, html_args, scan_args, fixxref_args, mkdb_args, @@ -91,7 +91,7 @@ index 2a5ee8b..2fd692b 100644 html_assets, content_files, ignore_headers, namespace, expand_content_files, mode): print("Building documentation for %s" % module) -@@ -115,6 +116,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, +@@ -135,6 +136,9 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, if gobject_typesfile: scanobjs_cmd = ['gtkdoc-scangobj'] + scanobjs_args + ['--types=' + gobject_typesfile, '--module=' + module, @@ -100,8 +100,8 @@ index 2a5ee8b..2fd692b 100644 + '--ld=' + ld, '--cflags=' + cflags, '--ldflags=' + ldflags, - '--ld=' + ld] -@@ -219,6 +223,7 @@ def run(args): + '--cc=' + cc, +@@ -238,6 +242,7 @@ def run(args): mkdbargs, options.gobject_typesfile, scanobjsargs, |