summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-09-06 12:29:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-10 12:13:06 +0100
commitc687dcb312e055c64ca8a17e492f3ca5f0236ece (patch)
tree12cfe4b03264cb4bb6878b93c1b712b06e79158f /meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
parentb4696f512443412ac79b1cc7816aa1ccf809996e (diff)
downloadpoky-c687dcb312e055c64ca8a17e492f3ca5f0236ece.tar.gz
gobject-introspection: update to 1.58.0
License-Update: clarification of what parts of g-i are licensed under which license. Actual terms are the same. Add a patch to deal with prelink-rtld returning 127 in some cases despite there being no error. (From OE-Core rev: 50b2187ed8b54317e953882034ba5648e0a4b764) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 4aa2e3cb2b..e9338e92e2 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 3875175563df28813c22b1de6bda260285f65cb0 Mon Sep 17 00:00:00 2001 1From 3fea5e83803f4cfef21b2e06e37a6ba56f2bb914 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,7 +19,7 @@ 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 d10327c..47f57c6 100644 22index c003828..8a8ba2b 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@@ -109,7 +109,7 @@ class CCompiler(object):
@@ -35,16 +35,16 @@ index d10327c..47f57c6 100644
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:
38- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH'] 38- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
39+ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar] 39+ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
40 # Search the current directory first 40 # Search the current directory first
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 3c7220b..0abd565 100644 44index 2c668f5..2e515a0 100644
45--- a/giscanner/dumper.py 45--- a/giscanner/dumper.py
46+++ b/giscanner/dumper.py 46+++ b/giscanner/dumper.py
47@@ -259,7 +259,8 @@ class DumpCompiler(object): 47@@ -249,7 +249,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 3c7220b..0abd565 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 d262785..51c9570 100755 58index 5cb793e..87227e2 100644
59--- a/giscanner/scannermain.py 59--- a/giscanner/scannermain.py
60+++ b/giscanner/scannermain.py 60+++ b/giscanner/scannermain.py
61@@ -130,6 +130,9 @@ def _get_option_parser(): 61@@ -132,6 +132,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)")