From 1010171280cb34c8dc361644b66fdd1a041d297a Mon Sep 17 00:00:00 2001 From: Dion Mendel Date: Thu, 22 Apr 2021 10:32:35 +0800 Subject: gremlin: 'elf-dynamic-info' returns a file name rathern than a dynamic entry. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- guix/build/gremlin.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'guix/build/gremlin.scm') 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 @@ (define (matching-entry type) (#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) -- cgit v1.2.3