diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-09-06 12:29:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-10 12:13:06 +0100 |
commit | c687dcb312e055c64ca8a17e492f3ca5f0236ece (patch) | |
tree | 12cfe4b03264cb4bb6878b93c1b712b06e79158f /meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch | |
parent | b4696f512443412ac79b1cc7816aa1ccf809996e (diff) | |
download | poky-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-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 | 27 |
1 files changed, 27 insertions, 0 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 new file mode 100644 index 0000000000..9167f042e5 --- /dev/null +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From f128cbeead687bfc6532cc1f2cc3e2dc5a2b5b30 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 | giscanner/shlibs.py | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py | ||
16 | index 01d21a3..3bd3250 100644 | ||
17 | --- a/giscanner/shlibs.py | ||
18 | +++ b/giscanner/shlibs.py | ||
19 | @@ -108,7 +108,7 @@ def _resolve_non_libtool(options, binary, libraries): | ||
20 | args.extend(['otool', '-L', binary.args[0]]) | ||
21 | else: | ||
22 | args.extend(['ldd', binary.args[0]]) | ||
23 | - output = subprocess.check_output(args) | ||
24 | + output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout | ||
25 | if isinstance(output, bytes): | ||
26 | output = output.decode("utf-8", "replace") | ||
27 | |||