diff options
author | Dion Mendel <guix@dm9.info> | 2021-04-22 10:32:35 +0800 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-22 14:04:27 +0200 |
commit | 1010171280cb34c8dc361644b66fdd1a041d297a (patch) | |
tree | b4b8219c92dfdb9e139b82055eaa870ed4ddc165 /guix | |
parent | a24562af52d2f318c9e17be73393ddb4bd9e347c (diff) | |
download | guix-patches-1010171280cb34c8dc361644b66fdd1a041d297a.tar guix-patches-1010171280cb34c8dc361644b66fdd1a041d297a.tar.gz |
gremlin: 'elf-dynamic-info' returns a file name rathern than a dynamic entry.
* guix/build/gremlin.scm (elf-dynamic-info): Return the dynamic entry
value, not the dynamic entry.
* tests/gremlin.scm ("elf-dynamic-info-soname"): New test.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix')
-rw-r--r-- | guix/build/gremlin.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build/gremlin.scm b/guix/build/gremlin.scm index a2d2169ddc..2a74d51dd9 100644 --- a/guix/build/gremlin.scm +++ b/guix/build/gremlin.scm @@ -226,7 +226,9 @@ string table if the type is a string." (#f #f) ((? elf-segment? dynamic) (let ((entries (dynamic-entries elf dynamic))) - (%elf-dynamic-info (find (matching-entry DT_SONAME) entries) + (%elf-dynamic-info (and=> (find (matching-entry DT_SONAME) + entries) + dynamic-entry-value) (filter-map (lambda (entry) (and (= (dynamic-entry-type entry) DT_NEEDED) |