summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
index e9338e92e2..ddd955354d 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
@@ -1,4 +1,4 @@
1From 3fea5e83803f4cfef21b2e06e37a6ba56f2bb914 Mon Sep 17 00:00:00 2001 1From 6653c28f0b76aad86e26c512b03efcec6d9d9e95 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 3 Jan 2018 17:02:01 +0200 3Date: Wed, 3 Jan 2018 17:02:01 +0200
4Subject: [PATCH] giscanner: add a --lib-dirs-envvar option 4Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
@@ -19,10 +19,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
19 3 files changed, 7 insertions(+), 3 deletions(-) 19 3 files changed, 7 insertions(+), 3 deletions(-)
20 20
21diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py 21diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
22index c003828..8a8ba2b 100644 22index 32c9296..3fb262b 100644
23--- a/giscanner/ccompiler.py 23--- a/giscanner/ccompiler.py
24+++ b/giscanner/ccompiler.py 24+++ b/giscanner/ccompiler.py
25@@ -109,7 +109,7 @@ class CCompiler(object): 25@@ -174,7 +174,7 @@ class CCompiler(object):
26 26
27 self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations" 27 self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations"
28 28
@@ -31,7 +31,7 @@ index c003828..8a8ba2b 100644
31 # An "internal" link is where the library to be introspected 31 # An "internal" link is where the library to be introspected
32 # is being built in the current directory. 32 # is being built in the current directory.
33 33
34@@ -119,7 +119,7 @@ class CCompiler(object): 34@@ -184,7 +184,7 @@ class CCompiler(object):
35 if os.name == 'nt': 35 if os.name == 'nt':
36 runtime_path_envvar = ['LIB', 'PATH'] 36 runtime_path_envvar = ['LIB', 'PATH']
37 else: 37 else:
@@ -41,10 +41,10 @@ index c003828..8a8ba2b 100644
41 # (This flag is not supported nor needed for Visual C++) 41 # (This flag is not supported nor needed for Visual C++)
42 args.append('-L.') 42 args.append('-L.')
43diff --git a/giscanner/dumper.py b/giscanner/dumper.py 43diff --git a/giscanner/dumper.py b/giscanner/dumper.py
44index 2c668f5..2e515a0 100644 44index 2b851a5..10a7c39 100644
45--- a/giscanner/dumper.py 45--- a/giscanner/dumper.py
46+++ b/giscanner/dumper.py 46+++ b/giscanner/dumper.py
47@@ -249,7 +249,8 @@ class DumpCompiler(object): 47@@ -244,7 +244,8 @@ class DumpCompiler(object):
48 libtool, 48 libtool,
49 self._options.libraries, 49 self._options.libraries,
50 self._options.extra_libraries, 50 self._options.extra_libraries,
@@ -55,10 +55,10 @@ index 2c668f5..2e515a0 100644
55 55
56 else: 56 else:
57diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py 57diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
58index 5cb793e..87227e2 100644 58index 9013562..9c9fe12 100644
59--- a/giscanner/scannermain.py 59--- a/giscanner/scannermain.py
60+++ b/giscanner/scannermain.py 60+++ b/giscanner/scannermain.py
61@@ -132,6 +132,9 @@ def _get_option_parser(): 61@@ -126,6 +126,9 @@ def _get_option_parser():
62 parser.add_option("", "--use-ldd-wrapper", 62 parser.add_option("", "--use-ldd-wrapper",
63 action="store", dest="ldd_wrapper", default=None, 63 action="store", dest="ldd_wrapper", default=None,
64 help="wrapper to use instead of ldd (useful when cross-compiling)") 64 help="wrapper to use instead of ldd (useful when cross-compiling)")