Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
9.3 kB · 192 lines
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193diff --git a/giscanner/scannermain.py b/giscanner/scannermain.pyindex 64575557..1eb0a2b4 100644--- a/giscanner/scannermain.py+++ b/giscanner/scannermain.py@@ -95,6 +95,39 @@ def get_windows_option_group(parser): return group +def _get_default_fallback_libpath():+ # Newer multiple-output-optimized stdenv has an environment variable+ # $outputLib which in turn specifies another variable which then is used as+ # the destination for the library contents (${!outputLib}/lib).+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None+ if store_path is None:+ outputs = os.environ.get("outputs", "out").split()+ if "lib" in outputs:+ # For multiple output derivations let's try whether there is a $lib+ # environment variable and use that as the base store path.+ store_path = os.environ.get("lib")+ elif "out" in outputs:+ # Otherwise we have a single output derivation, so the libraries+ # most certainly will end up in "$out/lib".+ store_path = os.environ.get("out")++ if store_path is not None:+ # Even if we have a $lib as output, there still should be a $lib/lib+ # directory.+ return os.path.join(store_path, 'lib')+ else:+ # If we haven't found a possible scenario, let's return an empty string+ # so that the shared library won't be prepended with a path.+ #+ # Note that this doesn't mean that all hope is lost, because after all+ # we can still use --fallback-library-path to set one.+ #+ # Also, we're not returning None, because that would make it very+ # difficult to disable adding fallback paths altogether using something+ # like: --fallback-library-path=""+ return ""++ def _get_option_parser(): parser = optparse.OptionParser('%prog [options] sources', version='%prog ' + giscanner.__version__)@@ -214,6 +247,10 @@ match the namespace prefix.""") parser.add_option("", "--c-include", action="append", dest="c_includes", default=[], help="headers which should be included in C programs")+ parser.add_option("", "--fallback-library-path",+ action="store", dest="fallback_libpath",+ default=_get_default_fallback_libpath(),+ help="Path to prepend to unknown shared libraries") parser.add_option("", "--filelist", action="store", dest="filelist", default=[], help="file containing headers and sources to be scanned")diff --git a/giscanner/shlibs.py b/giscanner/shlibs.pyindex 9f8ab5df..af325022 100644--- a/giscanner/shlibs.py+++ b/giscanner/shlibs.py@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): $""" % re.escape(library_name), re.VERBOSE) +def _ldd_library_nix_pattern(library_name):+ nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'+ return re.compile(pattern % (nix_store_dir, 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().@@ -108,7 +114,8 @@ def _resolve_non_libtool(options, binary, libraries): output = output.decode("utf-8", "replace") shlibs = resolve_from_ldd_output(libraries, output)- return list(map(sanitize_shlib_path, shlibs))+ fallback_libpath = options.fallback_libpath or "";+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) def sanitize_shlib_path(lib):@@ -117,19 +124,18 @@ def sanitize_shlib_path(lib): # In case we get relative paths on macOS (like @rpath) then we fall # back to the basename as well: # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222- if sys.platform == "darwin":- if not os.path.isabs(lib):- return os.path.basename(lib)- return lib- else:++ # Always use absolute paths if available+ if not os.path.isabs(lib): return os.path.basename(lib)+ return lib def resolve_from_ldd_output(libraries, output): patterns = {} for library in libraries: if not os.path.isfile(library):- patterns[library] = _ldd_library_pattern(library)+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_nix_pattern(library)) if len(patterns) == 0: return [] @@ -141,8 +147,11 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split():- for library, pattern in patterns.items():- m = pattern.match(word)+ for library, (pattern, nix_pattern) in patterns.items():+ if line.find('@nixStoreDir@') != -1:+ m = nix_pattern.match(word)+ else:+ m = pattern.match(word) if m: del patterns[library] shlibs.append(m.group())diff --git a/giscanner/utils.py b/giscanner/utils.pyindex 31c7ea48..630002a8 100644--- a/giscanner/utils.py+++ b/giscanner/utils.py@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None - # Darwin uses absolute paths where possible; since the libtool files never- # contain absolute paths, use the libdir field- if platform.system() == 'Darwin':- dlbasename = os.path.basename(dlname)- libdir = _extract_libdir_field(la_file)- if libdir is None:- return dlbasename- return libdir + '/' + dlbasename- # Older libtools had a path rather than the raw dlname- return os.path.basename(dlname)+ dlbasename = os.path.basename(dlname)+ libdir = _extract_libdir_field(la_file)+ if libdir is None:+ return dlbasename+ return libdir + '/' + dlbasename # Returns arguments for invoking libtool, if applicable, otherwise Nonediff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.pyindex a8337c60..72789d76 100644--- a/tests/scanner/test_shlibs.py+++ b/tests/scanner/test_shlibs.py@@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path class TestLddParser(unittest.TestCase): + def test_resolve_from_ldd_output_nix(self):+ output = '''\+ libglib-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0 (0x00007f0ee1b28000)+ libgobject-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgobject-2.0.so.0 (0x00007f0ee18cf000)+ libgio-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0 (0x00007f0ee1502000)+ libxml2.so.2 => @nixStoreDir@/72mxkk74cv266snkjpz1kwl1i2rg8rpc-libxml2-2.9.8/lib/libxml2.so.2 (0x00007f0ee119c000)+ libsqlite3.so.0 => @nixStoreDir@/ck5ay23hsmlc67pg3m34kzd1k2hhvww0-sqlite-3.24.0/lib/libsqlite3.so.0 (0x00007f0ee0e98000)+ libpsl.so.5 => @nixStoreDir@/qn3l2gn7m76f318676wflrs2z6d4rrkj-libpsl-0.20.2-list-2017-02-03/lib/libpsl.so.5 (0x00007f0ee0c88000)+ libc.so.6 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libc.so.6 (0x00007f0ee08d4000)+ libpcre.so.1 => @nixStoreDir@/hxbq8lpc53qsf1bc0dfcsm47wmcxzjvh-pcre-8.42/lib/libpcre.so.1 (0x00007f0ee0662000)+ @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib64/ld-linux-x86-64.so.2 (0x00007f0ee20ff000)+ libblkid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libblkid.so.1 (0x00007f0edd0cd000)+ libuuid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libuuid.so.1 (0x00007f0edcec5000)+ librt.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/librt.so.1 (0x00007f0edccbd000)+ libstdc++.so.6 => @nixStoreDir@/3v5r7fkrbkw2qajadvjbf6p6qriz9p1i-gcc-7.3.0-lib/lib/libstdc++.so.6 (0x00007f0edc936000)+ libgcc_s.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libgcc_s.so.1 (0x00007f0edc720000)+ '''+ libraries = ['glib-2.0', 'gio-2.0']++ self.assertEqual(+ ['@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0',+ '@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0'],+ resolve_from_ldd_output(libraries, output))+ def test_resolve_from_ldd_output(self): output = '''\ libglib-2.0.so.0 => /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 (0x00007fbe12d68000)@@ -40,7 +64,8 @@ class TestLddParser(unittest.TestCase): self.assertEqual( sanitize_shlib_path('/foo/bar'),- '/foo/bar' if sys.platform == 'darwin' else 'bar')+ # NixOS always want the absolute path+ '/foo/bar') def test_unresolved_library(self): output = ''