blob: 11fd9ed3acc704a6f2f3219a257e4166ea09fa75 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 4 Aug 2017 16:16:41 +0300
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08004Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
Brad Bishop316dfdd2018-06-25 12:45:53 -04005
6Specifically:
71) Make it possible to specify a wrapper for executing binaries
8(usually, some kind of target hardware emulator, such as qemu)
92) Explicitly provide CC and LD via command line, as otherwise gtk-doc will
10try to guess them, incorrectly.
113) If things break down, print the full command with arguments,
12not just the binary name.
134) Correctly determine the compiler/linker executables and cross-options when cross-compiling
14
15Upstream-Status: Pending
16Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
17
18---
Brad Bishop19323692019-04-05 15:28:33 -040019 mesonbuild/modules/gnome.py | 4 ++++
20 1 file changed, 4 insertions(+)
Brad Bishop316dfdd2018-06-25 12:45:53 -040021
22diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
Brad Bishop19323692019-04-05 15:28:33 -040023index bf49770..7c5a363 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -040024--- a/mesonbuild/modules/gnome.py
25+++ b/mesonbuild/modules/gnome.py
Brad Bishop19323692019-04-05 15:28:33 -040026@@ -972,6 +972,10 @@ This will become a hard error in the future.''')
Brad Bishop316dfdd2018-06-25 12:45:53 -040027 '--mode=' + mode]
28 if namespace:
29 args.append('--namespace=' + namespace)
30+ gtkdoc_exe_wrapper = state.environment.cross_info.config["properties"].get('gtkdoc_exe_wrapper', None)
31+ if gtkdoc_exe_wrapper is not None:
Brad Bishop19323692019-04-05 15:28:33 -040032+ args.append('--run=' + gtkdoc_exe_wrapper)
Brad Bishop316dfdd2018-06-25 12:45:53 -040033+
34 args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
35 args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
36 args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs)