--- Begin Message ---
Subject: |
[PATCH] build: Fix elf-dynamic-info-soname. |
Date: |
Wed, 21 Apr 2021 03:44:29 +0800 |
User-agent: |
Mutt/1.9.4 (2018-02-28) |
* 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
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#47921: [PATCH] build: Fix elf-dynamic-info-soname. |
Date: |
Thu, 22 Apr 2021 10:20:16 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) |
Hi Dion,
Dion Mendel <guix@dm9.info> skribis:
>>From bfc69ea726e0f5c1955e629e92af377ffb90c2c5 Mon Sep 17 00:00:00 2001
> From: Dion Mendel <guix@dm9.info>
> Date: Thu, 22 Apr 2021 10:32:35 +0800
> Subject: [PATCH] * guix/build/gremlin.scm (elf-dynamic-info): Correctly set
> the value of soname in <elf-dynamic-info>.
>
> ---
> guix/build/gremlin.scm | 4 +++-
> tests/gremlin.scm | 18 ++++++++++++++++++
> 2 files changed, 21 insertions(+), 1 deletion(-)
Awesome. I tweaked the commit message and applied it.
Thank you, and thanks Maxime for the review!
Ludo’.
--- End Message ---