mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
c420de6b05
The gi-r-scanner is generating a list of shared libraries that are referenced in the shared-library attribute of the <namespace/> element of the GIR file. However, this attribute only contains the names of the libraries and not the full store paths, like for example while preparing to package libblockdev, the following items were included in the shared-library attribute: /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0 libm.so.6 libdmraid.so.1.0.0.rc16 libbd_utils.so.0 Unfortunately, loading such a library without setting LD_LIBRARY_PATH is going to fail finding libm.so.6 and libdmraid.so.1.0.0.rc16. Now the first attempt at solving this was to put absolute paths of all the libraries referenced in the shared-library attribute, but this also led up to including paths of build-time shared objects into that attribute: /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0 /nix/store/...-glibc-2.21/lib/libm.so.6 /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16 /tmp/nix-build-libblockdev-1.3.drv-0/.../utils/.libs/libbd_utils.so.0 This of course is not what we want, so the final solution is to only use the absolute path whenever it is a Nix path and leave the library name as-is if the path doesn't reside within the store, like this: /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0 /nix/store/...-glibc-2.21/lib/libm.so.6 /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16 libbd_utils.so.0 The downside of this approach is that if not even the output path of the library is in LD_LIBRARY_PATH, even loading of libbd_utils.so.0 could fail, so we need to patch the loader as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
|
|
index 838d343..9dbdc0f 100644
|
|
--- a/giscanner/shlibs.py
|
|
+++ b/giscanner/shlibs.py
|
|
@@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
|
|
# Match absolute paths on OS X to conform to how libraries are usually
|
|
# referenced on OS X systems.
|
|
def _ldd_library_pattern(library_name):
|
|
+ nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
|
|
pattern = "(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
|
|
- if platform.system() == 'Darwin':
|
|
- pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
|
|
- return re.compile(pattern % re.escape(library_name))
|
|
+ pattern = r'''
|
|
+ (
|
|
+ (?:
|
|
+ # First match Nix store paths because they need to be absolute.
|
|
+ (?:%s(?:/[^/]*)+)
|
|
+ # Everything else not a store path remains relative, because we
|
|
+ # would end up having absolute build paths in the resulting GIR
|
|
+ # file.
|
|
+ | (?<=/)
|
|
+ )
|
|
+ # And finally the library itself:
|
|
+ (?:lib%s[^A-Za-z0-9_-][^\s\(\)]*)
|
|
+ )
|
|
+ '''
|
|
+ return re.compile(pattern % (nix_store_dir, re.escape(library_name)),
|
|
+ re.VERBOSE)
|
|
|
|
|
|
# This is a what we do for non-la files. We assume that we are on an
|
|
diff --git a/giscanner/utils.py b/giscanner/utils.py
|
|
index 660081e..c9c767a 100644
|
|
--- a/giscanner/utils.py
|
|
+++ b/giscanner/utils.py
|
|
@@ -109,17 +109,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
|
|
- # From the comments in extract_libtool(), 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
|
|
|
|
|
|
def extract_libtool(la_file):
|