From patchwork Tue Apr 20 19:44:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dion Mendel X-Patchwork-Id: 28717 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 62F6027BC7A; Tue, 20 Apr 2021 22:04:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BDBFF27BC79 for ; Tue, 20 Apr 2021 22:04:09 +0100 (BST) Received: from localhost ([::1]:35746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYxXV-00025l-0p for patchwork@mira.cbaines.net; Tue, 20 Apr 2021 17:04:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYxQg-0007Wq-LL for guix-patches@gnu.org; Tue, 20 Apr 2021 16:57:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYxQc-0001F3-IX for guix-patches@gnu.org; Tue, 20 Apr 2021 16:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYxQc-0002LX-I6 for guix-patches@gnu.org; Tue, 20 Apr 2021 16:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47921] [PATCH] build: Fix elf-dynamic-info-soname. Resent-From: Dion Mendel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Apr 2021 20:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47921 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47921@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16189521818909 (code B ref -1); Tue, 20 Apr 2021 20:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Apr 2021 20:56:21 +0000 Received: from localhost ([127.0.0.1]:56174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYxPw-0002Jb-HL for submit@debbugs.gnu.org; Tue, 20 Apr 2021 16:56:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:59462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYwIc-0006sw-I1 for submit@debbugs.gnu.org; Tue, 20 Apr 2021 15:44:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYwIc-0008WE-A0 for guix-patches@gnu.org; Tue, 20 Apr 2021 15:44:42 -0400 Received: from donkey.elm.relay.mailchannels.net ([23.83.212.49]:51511) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYwIZ-00078W-Ac for guix-patches@gnu.org; Tue, 20 Apr 2021 15:44:41 -0400 X-Sender-Id: dreamhost|x-authsender|smtp@dm9.info Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 74EC83421B7 for ; Tue, 20 Apr 2021 19:44:34 +0000 (UTC) Received: from pdx1-sub0-mail-a33.g.dreamhost.com (100-96-17-224.trex.outbound.svc.cluster.local [100.96.17.224]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 0C22A3421E9 for ; Tue, 20 Apr 2021 19:44:34 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|smtp@dm9.info Received: from pdx1-sub0-mail-a33.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.17.224 (trex/6.1.1); Tue, 20 Apr 2021 19:44:34 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|smtp@dm9.info X-MailChannels-Auth-Id: dreamhost X-Well-Made-Cold: 48a0c264219079fb_1618947874251_2891751553 X-MC-Loop-Signature: 1618947874250:1733234350 X-MC-Ingress-Time: 1618947874250 Received: from pdx1-sub0-mail-a33.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a33.g.dreamhost.com (Postfix) with ESMTP id B5F0B8289F for ; Tue, 20 Apr 2021 12:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=dm9.info; h=date:from:to :subject:message-id:mime-version:content-type; s=dm9.info; bh=U6 2LK1IxP+Cgs+qmJVmG31yU/9g=; b=CAT05WLKExM5wBEmi3OlgLkrNmyX2ZqrLO QKzNaNCAN0qgSPggvAqyOnn9CcUnnBcfk9stmGJ3JvnbPEmoL4X49E00B0/zqZo/ e2PkzkJuMu5YDQqDvWrJbWDyXgsf9XYcFAQySSRDVMcwdWyrQM4UnCUhi90mp7qm JwoEWbMzA= Received: from mail.localdomain (61-245-140-70.3df58c.per.nbn.aussiebb.net [61.245.140.70]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: smtp@dm9.info) by pdx1-sub0-mail-a33.g.dreamhost.com (Postfix) with ESMTPSA id 75AB57F08C for ; Tue, 20 Apr 2021 12:44:33 -0700 (PDT) Received: by mail.localdomain (Postfix, from userid 2001) id 7BC814FEE07; Wed, 21 Apr 2021 03:44:29 +0800 (AWST) Date: Wed, 21 Apr 2021 03:44:29 +0800 X-DH-BACKEND: pdx1-sub0-mail-a33 From: Dion Mendel Message-ID: <20210420194429.GB29387@dm9.info> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Received-SPF: none client-ip=23.83.212.49; envelope-from=guix@dm9.info; helo=donkey.elm.relay.mailchannels.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 20 Apr 2021 16:56:18 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 20 Apr 2021 17:03:45 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)