GNU bug report logs - #47921
[PATCH] build: Fix elf-dynamic-info-soname.

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Dion Mendel <guix <at> dm9.info>
To: guix-patches <at> gnu.org
Subject: [PATCH] build: Fix elf-dynamic-info-soname.
Date: Wed, 21 Apr 2021 03:44:29 +0800

* guix/build/gremlin.scm (elf-dynamic-info-soname): Return the value of
 the dynamic-entry instead of the dynamic-entry record itself.
---
guix/build/gremlin.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guix/build/gremlin.scm b/guix/build/gremlin.scm
index e8ea66dfb3..4a31c3cfaf 100644
--- a/guix/build/gremlin.scm
+++ b/guix/build/gremlin.scm
@@ -215,7 +215,10 @@ 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 (or (and=> (find (matching-entry DT_SONAME)
+                                           entries)
+                                     dynamic-entry-value)
+                              #f)
                          (filter-map (lambda (entry)
                                        (and (= (dynamic-entry-type entry)
                                                DT_NEEDED)
-- 
2.31.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.