summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-04 15:58:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-05 11:55:35 +0000
commit82e7cd6f7512420748c1e3470c0229e6d32ff9a7 (patch)
tree107e30f9b2ab2b3a1479557464d7df3caac7dea7 /meta
parentf5c80ba8f7349fca94e2be45ecef229862f8976a (diff)
downloadpoky-82e7cd6f7512420748c1e3470c0229e6d32ff9a7.tar.gz
gobject-introspection: correct the --lib-dirs-envvar patch
The first version introduced a new branch in if-else statement, and so discarded the actions in the branch taken previously. This seemed to have no adverse effect for now, but let's do it right. (From OE-Core rev: b7be3aa46f676066ad05cf8192800ae184095838) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch26
1 files changed, 13 insertions, 13 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 e1776bc9b4..4ec527dcc0 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 a02076fe916ade6c3f78f6d35072ec53482e9446 Mon Sep 17 00:00:00 2001 1From e48f1e18f5ea41656f0ba10fe61d69d2604b0064 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
@@ -11,17 +11,18 @@ which can be picked up and used by the wrapper.
11 11
12Upstream-Status: Pending 12Upstream-Status: Pending
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14
14--- 15---
15 giscanner/ccompiler.py | 6 ++++-- 16 giscanner/ccompiler.py | 4 ++--
16 giscanner/dumper.py | 3 ++- 17 giscanner/dumper.py | 3 ++-
17 giscanner/scannermain.py | 3 +++ 18 giscanner/scannermain.py | 3 +++
18 3 files changed, 9 insertions(+), 3 deletions(-) 19 3 files changed, 7 insertions(+), 3 deletions(-)
19 20
20diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py 21diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
21index 29de0ee..e969337 100644 22index 29de0ee..928eae8 100644
22--- a/giscanner/ccompiler.py 23--- a/giscanner/ccompiler.py
23+++ b/giscanner/ccompiler.py 24+++ b/giscanner/ccompiler.py
24@@ -109,14 +109,16 @@ class CCompiler(object): 25@@ -109,7 +109,7 @@ class CCompiler(object):
25 26
26 self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations" 27 self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations"
27 28
@@ -30,16 +31,15 @@ index 29de0ee..e969337 100644
30 # An "internal" link is where the library to be introspected 31 # An "internal" link is where the library to be introspected
31 # is being built in the current directory. 32 # is being built in the current directory.
32 33
33 runtime_path_envvar = [] 34@@ -119,7 +119,7 @@ class CCompiler(object):
34 runtime_paths = [] 35 if self.check_is_msvc():
35
36- if self.check_is_msvc():
37+ if lib_dirs_envvar:
38+ runtime_path_envvar = [lib_dirs_envvar]
39+ elif self.check_is_msvc():
40 runtime_path_envvar = ['LIB', 'PATH'] 36 runtime_path_envvar = ['LIB', 'PATH']
41 else: 37 else:
42 runtime_path_envvar = ['LD_LIBRARY_PATH'] 38- runtime_path_envvar = ['LD_LIBRARY_PATH']
39+ runtime_path_envvar = ['LD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
40 # Search the current directory first
41 # (This flag is not supported nor needed for Visual C++)
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 7f77bd2..db96df6 100644 44index 7f77bd2..db96df6 100644
45--- a/giscanner/dumper.py 45--- a/giscanner/dumper.py