diff options
| author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-04-24 14:06:18 +0200 |
|---|---|---|
| committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-05-07 23:38:22 +0200 |
| commit | c9e2d880011c530ff1454fe31a2d40d189860be5 (patch) | |
| tree | 9acdf7d7cf409ffd8d0f7967ebf9d03497d31269 /giscanner/shlibs.py | |
| parent | a031129d8ab28e2f51e95e7266f1274bdc592557 (diff) | |
| download | gobject-introspection-c9e2d880011c530ff1454fe31a2d40d189860be5.tar.gz | |
tests: Update misc/pep8.py to 1.4.5
Version in our tree is a wee bit outdated. For example,
later work will introduce an utf8 encoded python source
file which our old pep8.py does not yet understand (yeah,
it really was *that* ancient)...
Updated from:
https://raw.github.com/jcrocholl/pep8/1.4.5/pep8.py
Takes 552c1f1525e37a30376790151c1ba437776682c5,
f941537d1c0a40f0906490ed160db6c79af572d3,
5a4afe2a77d0ff7d9fea13dd93c3304a6ca993de and
a17f157e19bd6792c00321c8020dca5e5a281f45 into account...
https://bugzilla.gnome.org/show_bug.cgi?id=699535
Diffstat (limited to 'giscanner/shlibs.py')
| -rw-r--r-- | giscanner/shlibs.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 4f622db3..1241827d 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -26,6 +26,7 @@ import subprocess from .utils import get_libtool_command, extract_libtool_shlib + # For .la files, the situation is easy. def _resolve_libtool(options, binary, libraries): shlibs = [] @@ -36,6 +37,7 @@ def _resolve_libtool(options, binary, libraries): return shlibs + # Assume ldd output is something vaguely like # # libpangoft2-1.0.so.0 => /usr/lib/libpangoft2-1.0.so.0 (0x006c1000) @@ -51,6 +53,7 @@ def _ldd_library_pattern(library_name): return re.compile("(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)" % re.escape(library_name)) + # This is a what we do for non-la files. We assume that we are on an # ELF-like system where ldd exists and the soname extracted with ldd is # a filename that can be opened with dlopen(). @@ -118,6 +121,7 @@ def _resolve_non_libtool(options, binary, libraries): return shlibs + # We want to resolve a set of library names (the <foo> of -l<foo>) # against a library to find the shared library name. The shared # library name is suppose to be what you pass to dlopen() (or |