gobjectIntrospection: 1.56.0 → 1.58.1

Upstream now strips absolute paths to their basename on all platforms apart from
Darwin: a41abe1868

To get around this without modifying the basename test we simply pass in
`basename=False` when normally generating gir files.
This commit is contained in:
Jan Tojnar
2018-09-05 00:49:11 +00:00
parent b2f1c63364
commit fe4b53b8c3
5 changed files with 62 additions and 47 deletions

View File

@@ -25,12 +25,12 @@ index c93d20c..4d4915d 100644
# Assume ldd output is something vaguely like
#
@@ -121,7 +137,7 @@ def _resolve_non_libtool(options, binary, libraries):
m = pattern.search(line)
@@ -136,7 +152,7 @@ def resolve_from_ldd_output(libraries, output, basename=False):
m = pattern.match(word)
if m:
del patterns[library]
- shlibs.append(m.group(1))
+ shlibs.append(_sanitize_install_name(m.group(1)))
- shlibs.append(m.group())
+ shlibs.append(_sanitize_install_name(m.group()))
break
if len(patterns) > 0:
if len(patterns) > 0: