diff options
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch deleted file mode 100644 index b954dcebd8..0000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 5f985fd8a24764ccb38af6335d4584d7e33fc3a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 19 Oct 2015 18:26:40 +0300 | ||
4 | Subject: [PATCH] giscanner: add --use-binary-wrapper option | ||
5 | |||
6 | With this option, giscanner will use a wrapper executable to run | ||
7 | binaries it's producing, instead of running them directly. This | ||
8 | is useful when binaries are cross-compiled and cannot be run directly, | ||
9 | but they can be run using for example QEMU emulation. | ||
10 | |||
11 | Upstream-Status: Pending [review on oe-core list] | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | |||
14 | --- | ||
15 | giscanner/scannermain.py | 14 ++++++++++++++ | ||
16 | 1 file changed, 14 insertions(+) | ||
17 | |||
18 | diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py | ||
19 | index c004fb1..0b6a2d2 100644 | ||
20 | --- a/giscanner/scannermain.py | ||
21 | +++ b/giscanner/scannermain.py | ||
22 | @@ -120,6 +120,9 @@ def _get_option_parser(): | ||
23 | parser.add_option("", "--program", | ||
24 | action="store", dest="program", default=None, | ||
25 | help="program to execute") | ||
26 | + parser.add_option("", "--use-binary-wrapper", | ||
27 | + action="store", dest="wrapper", default=None, | ||
28 | + help="wrapper to use for running programs (useful when cross-compiling)") | ||
29 | parser.add_option("", "--program-arg", | ||
30 | action="append", dest="program_args", default=[], | ||
31 | help="extra arguments to program") | ||
32 | @@ -417,6 +420,17 @@ def create_binary(transformer, options, args): | ||
33 | gdump_parser.get_error_quark_functions()) | ||
34 | |||
35 | shlibs = resolve_shlibs(options, binary, options.libraries) | ||
36 | + if options.wrapper: | ||
37 | + # The wrapper needs the binary itself, not the libtool wrapper script, | ||
38 | + # so we check if libtool has sneaked the binary into .libs subdirectory | ||
39 | + # and adjust the path accordingly | ||
40 | + import os.path | ||
41 | + dir_name, binary_name = os.path.split(binary.args[0]) | ||
42 | + libtool_binary = os.path.join(dir_name, '.libs', binary_name) | ||
43 | + if os.path.exists(libtool_binary): | ||
44 | + binary.args[0] = libtool_binary | ||
45 | + # Then prepend the wrapper to the command line to execute | ||
46 | + binary.args = [options.wrapper] + binary.args | ||
47 | gdump_parser.set_introspection_binary(binary) | ||
48 | gdump_parser.parse() | ||
49 | return shlibs | ||