summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch16
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
index afb71e767e..2e36b64bab 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
@@ -1,23 +1,24 @@
1From d4ad57fd4a32c4f0d2f0522a3090ef940746431b Mon Sep 17 00:00:00 2001 1From eba2b999e81d81b5f43bb1f0ab33881786bebdec Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Oct 2015 16:28:46 +0200 3Date: Fri, 30 Oct 2015 16:28:46 +0200
4Subject: [PATCH 4/5] giscanner: add a --use-ldd-wrapper option 4Subject: [PATCH] giscanner: add a --use-ldd-wrapper option
5 5
6This is useful in cross-compile environments where system's ldd 6This is useful in cross-compile environments where system's ldd
7command does not work on binaries built for a different architecture 7command does not work on binaries built for a different architecture
8 8
9Upstream-Status: Pending [review in oe-core] 9Upstream-Status: Pending [review in oe-core]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
11--- 12---
12 giscanner/scannermain.py | 3 +++ 13 giscanner/scannermain.py | 3 +++
13 giscanner/shlibs.py | 4 +++- 14 giscanner/shlibs.py | 4 +++-
14 2 files changed, 6 insertions(+), 1 deletion(-) 15 2 files changed, 6 insertions(+), 1 deletion(-)
15 16
16diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py 17diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
17index d684cd0..1b3b369 100755 18index 061def0..5cb793e 100644
18--- a/giscanner/scannermain.py 19--- a/giscanner/scannermain.py
19+++ b/giscanner/scannermain.py 20+++ b/giscanner/scannermain.py
20@@ -127,6 +127,9 @@ def _get_option_parser(): 21@@ -129,6 +129,9 @@ def _get_option_parser():
21 parser.add_option("", "--use-binary-wrapper", 22 parser.add_option("", "--use-binary-wrapper",
22 action="store", dest="wrapper", default=None, 23 action="store", dest="wrapper", default=None,
23 help="wrapper to use for running programs (useful when cross-compiling)") 24 help="wrapper to use for running programs (useful when cross-compiling)")
@@ -28,10 +29,10 @@ index d684cd0..1b3b369 100755
28 action="append", dest="program_args", default=[], 29 action="append", dest="program_args", default=[],
29 help="extra arguments to program") 30 help="extra arguments to program")
30diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py 31diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
31index c93d20c..c5b5942 100644 32index 7b7b2d0..01d21a3 100644
32--- a/giscanner/shlibs.py 33--- a/giscanner/shlibs.py
33+++ b/giscanner/shlibs.py 34+++ b/giscanner/shlibs.py
34@@ -105,7 +105,9 @@ def _resolve_non_libtool(options, binary, libraries): 35@@ -102,7 +102,9 @@ def _resolve_non_libtool(options, binary, libraries):
35 args.extend(libtool) 36 args.extend(libtool)
36 args.append('--mode=execute') 37 args.append('--mode=execute')
37 platform_system = platform.system() 38 platform_system = platform.system()
@@ -42,6 +43,3 @@ index c93d20c..c5b5942 100644
42 args.extend(['otool', '-L', binary.args[0]]) 43 args.extend(['otool', '-L', binary.args[0]])
43 else: 44 else:
44 args.extend(['ldd', binary.args[0]]) 45 args.extend(['ldd', binary.args[0]])
45--
462.7.0
47