diff options
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.patch | 16 |
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 @@ -From 3875175563df28813c22b1de6bda260285f65cb0 Mon Sep 17 00:00:00 2001 +From 3fea5e83803f4cfef21b2e06e37a6ba56f2bb914 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 3 Jan 2018 17:02:01 +0200 Subject: [PATCH] giscanner: add a --lib-dirs-envvar option @@ -19,7 +19,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index d10327c..47f57c6 100644 +index c003828..8a8ba2b 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -109,7 +109,7 @@ class CCompiler(object): @@ -35,16 +35,16 @@ index d10327c..47f57c6 100644 if os.name == 'nt': runtime_path_envvar = ['LIB', 'PATH'] else: -- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH'] -+ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar] +- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] ++ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar] # Search the current directory first # (This flag is not supported nor needed for Visual C++) args.append('-L.') diff --git a/giscanner/dumper.py b/giscanner/dumper.py -index 3c7220b..0abd565 100644 +index 2c668f5..2e515a0 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py -@@ -259,7 +259,8 @@ class DumpCompiler(object): +@@ -249,7 +249,8 @@ class DumpCompiler(object): libtool, self._options.libraries, self._options.extra_libraries, @@ -55,10 +55,10 @@ index 3c7220b..0abd565 100644 else: diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index d262785..51c9570 100755 +index 5cb793e..87227e2 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py -@@ -130,6 +130,9 @@ def _get_option_parser(): +@@ -132,6 +132,9 @@ def _get_option_parser(): parser.add_option("", "--use-ldd-wrapper", action="store", dest="ldd_wrapper", default=None, help="wrapper to use instead of ldd (useful when cross-compiling)") |