Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00 2001 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 4 Aug 2017 16:16:41 +0300 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
| 6 | Specifically: |
| 7 | 1) Make it possible to specify a wrapper for executing binaries |
| 8 | (usually, some kind of target hardware emulator, such as qemu) |
| 9 | 2) Explicitly provide CC and LD via command line, as otherwise gtk-doc will |
| 10 | try to guess them, incorrectly. |
| 11 | 3) If things break down, print the full command with arguments, |
| 12 | not just the binary name. |
| 13 | 4) Correctly determine the compiler/linker executables and cross-options when cross-compiling |
| 14 | |
| 15 | Upstream-Status: Pending |
| 16 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 17 | |
| 18 | --- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 19 | mesonbuild/modules/gnome.py | 4 ++++ |
| 20 | 1 file changed, 4 insertions(+) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 21 | |
| 22 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 23 | index bf49770..7c5a363 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 24 | --- a/mesonbuild/modules/gnome.py |
| 25 | +++ b/mesonbuild/modules/gnome.py |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 26 | @@ -972,6 +972,10 @@ This will become a hard error in the future.''') |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 27 | '--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 Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 32 | + args.append('--run=' + gtkdoc_exe_wrapper) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 33 | + |
| 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) |