|
@@ -1,31 +0,0 @@
|
|
|
-From e0fc4a2a5161a36483ddc518be9bb14390f11b19 Mon Sep 17 00:00:00 2001
|
|
|
-From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
-Date: Wed, 5 Sep 2018 16:46:52 +0200
|
|
|
-Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
|
|
|
-
|
|
|
-prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
|
|
|
-It is not an error per se, but it breaks subprocess.check_output().
|
|
|
-
|
|
|
-Upstream-Status: Inappropriate [oe-core specific]
|
|
|
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
|
----
|
|
|
- giscanner/shlibs.py | 2 +-
|
|
|
- 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
-
|
|
|
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
|
|
|
-index 9f8ab5df..7a1a72fe 100644
|
|
|
---- a/giscanner/shlibs.py
|
|
|
-+++ b/giscanner/shlibs.py
|
|
|
-@@ -103,7 +103,7 @@ def _resolve_non_libtool(options, binary, libraries):
|
|
|
- args.extend(['otool', '-L', binary.args[0]])
|
|
|
- else:
|
|
|
- args.extend(['ldd', binary.args[0]])
|
|
|
-- output = subprocess.check_output(args)
|
|
|
-+ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
|
|
|
- if isinstance(output, bytes):
|
|
|
- output = output.decode("utf-8", "replace")
|
|
|
-
|
|
|
---
|
|
|
-2.25.1
|
|
|
-
|