diff options
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch deleted file mode 100644 index b484b5e9e6..0000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 5 Sep 2018 16:46:52 +0200 | ||
4 | Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper | ||
5 | |||
6 | prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. | ||
7 | It is not an error per se, but it breaks subprocess.check_output(). | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | |||
12 | --- | ||
13 | giscanner/shlibs.py | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py | ||
17 | index d67df95..80352a6 100644 | ||
18 | --- a/giscanner/shlibs.py | ||
19 | +++ b/giscanner/shlibs.py | ||
20 | @@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries): | ||
21 | args.extend(['otool', '-L', binary.args[0]]) | ||
22 | else: | ||
23 | args.extend(['ldd', binary.args[0]]) | ||
24 | - output = subprocess.check_output(args) | ||
25 | + output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout | ||
26 | if isinstance(output, bytes): | ||
27 | output = output.decode("utf-8", "replace") | ||
28 | |||