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 | 36 |
1 files changed, 0 insertions, 36 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 deleted file mode 100644 index 471f1500da..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 4 Aug 2017 16:16:41 +0300 | ||
4 | Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling | ||
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 | --- | ||
19 | mesonbuild/modules/gnome.py | 4 ++++ | ||
20 | 1 file changed, 4 insertions(+) | ||
21 | |||
22 | diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py | ||
23 | index bcf77b9..6a4b472 100644 | ||
24 | --- a/mesonbuild/modules/gnome.py | ||
25 | +++ b/mesonbuild/modules/gnome.py | ||
26 | @@ -974,6 +974,10 @@ This will become a hard error in the future.''') | ||
27 | args.append('--{}={}'.format(program_name, path)) | ||
28 | if namespace: | ||
29 | args.append('--namespace=' + namespace) | ||
30 | + gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None) | ||
31 | + if gtkdoc_exe_wrapper is not None: | ||
32 | + args.append('--run=' + gtkdoc_exe_wrapper) | ||
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) | ||