From: Dion Mendel <guix@dm9.info>
To: 47921@debbugs.gnu.org
Subject: [bug#47921] [PATCH] build: Fix elf-dynamic-info-soname.
Date: Wed, 21 Apr 2021 03:44:29 +0800 [thread overview]
Message-ID: <20210420194429.GB29387@dm9.info> (raw)
* 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
next reply other threads:[~2021-04-20 21:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 19:44 Dion Mendel [this message]
2021-04-21 2:46 ` [bug#47921] [PATCH] build: Fix elf-dynamic-info-soname Dion Mendel
2021-04-21 11:49 ` Maxime Devos
2021-04-21 15:46 ` Dion Mendel
2021-04-21 18:33 ` Maxime Devos
2021-04-22 3:13 ` Dion Mendel
2021-04-22 8:20 ` bug#47921: " Ludovic Courtès
2021-04-22 2:55 ` [bug#47921] retitle Dion Mendel
2021-04-22 3:26 ` [bug#47921] Include correct commit message Dion Mendel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210420194429.GB29387@dm9.info \
--to=guix@dm9.info \
--cc=47921@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).