From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id HMO4IDMlgGBeZAEAgWs5BA (envelope-from ) for ; Wed, 21 Apr 2021 15:14:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sMVVGzMlgGCyXwAAB5/wlQ (envelope-from ) for ; Wed, 21 Apr 2021 13:14:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AE91D16120 for ; Wed, 21 Apr 2021 15:14:26 +0200 (CEST) Received: from localhost ([::1]:59596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZCgT-0001tA-SP for larch@yhetil.org; Wed, 21 Apr 2021 09:14:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZ2tK-0002Zq-Kg for guix-patches@gnu.org; Tue, 20 Apr 2021 22:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZ2tJ-000865-KV for guix-patches@gnu.org; Tue, 20 Apr 2021 22:47:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZ2tJ-0002qh-Hm for guix-patches@gnu.org; Tue, 20 Apr 2021 22:47:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47921] [PATCH] build: Fix elf-dynamic-info-soname. References: <20210420194429.GB29387@dm9.info> In-Reply-To: <20210420194429.GB29387@dm9.info> Resent-From: Dion Mendel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Apr 2021 02:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47921 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47921@debbugs.gnu.org Received: via spool by 47921-submit@debbugs.gnu.org id=B47921.161897322010944 (code B ref 47921); Wed, 21 Apr 2021 02:47:01 +0000 Received: (at 47921) by debbugs.gnu.org; 21 Apr 2021 02:47:00 +0000 Received: from localhost ([127.0.0.1]:56551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZ2tI-0002qS-4l for submit@debbugs.gnu.org; Tue, 20 Apr 2021 22:47:00 -0400 Received: from cyan.elm.relay.mailchannels.net ([23.83.212.47]:18413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZ2tF-0002qJ-JK for 47921@debbugs.gnu.org; Tue, 20 Apr 2021 22:46:58 -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 410ED1E258A for <47921@debbugs.gnu.org>; Wed, 21 Apr 2021 02:46:56 +0000 (UTC) Received: from pdx1-sub0-mail-a78.g.dreamhost.com (100-105-161-119.trex.outbound.svc.cluster.local [100.105.161.119]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 716C21E23E1 for <47921@debbugs.gnu.org>; Wed, 21 Apr 2021 02:46:55 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|smtp@dm9.info Received: from pdx1-sub0-mail-a78.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.105.161.119 (trex/6.1.1); Wed, 21 Apr 2021 02:46:56 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|smtp@dm9.info X-MailChannels-Auth-Id: dreamhost X-Zesty-Share: 249fdbd90f408ffc_1618973216079_2431200060 X-MC-Loop-Signature: 1618973216079:3651069109 X-MC-Ingress-Time: 1618973216079 Received: from pdx1-sub0-mail-a78.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a78.g.dreamhost.com (Postfix) with ESMTP id 2FCEC8BC2B for <47921@debbugs.gnu.org>; Tue, 20 Apr 2021 19:46:55 -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=Qw SLmtj3V/x3fkToWU44CbkSb58=; b=1aPQKg/vHCQji1RogIPs+yjUMmOpBz5XiK 1yNcbqsleWRE+StYaGYGxQxnbPGHqiAWG8dMm2C9Ih63Y1a3HWbWANJqy+edgmF0 2KMeHKjmynGTKbUBovcXzbsUjfCKPgkVmQnSfYbionNbWZHcqxRD2T944kA77Jhi Uadz4y5oE= 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-a78.g.dreamhost.com (Postfix) with ESMTPSA id E158F8B930 for <47921@debbugs.gnu.org>; Tue, 20 Apr 2021 19:46:54 -0700 (PDT) Received: by mail.localdomain (Postfix, from userid 2001) id BF4504FF0D7; Wed, 21 Apr 2021 10:46:50 +0800 (AWST) Date: Wed, 21 Apr 2021 10:46:50 +0800 X-DH-BACKEND: pdx1-sub0-mail-a78 From: Dion Mendel Message-ID: <20210421024650.GA30794@dm9.info> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nFreZHaLTZJo0R7j" Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 21 Apr 2021 09:14:22 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619010866; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=kH+5jk4XB48pyX9OO+SBr4z7UlbLUnluoZNi1g2bnwo=; b=HM+/kuj+AvdbFlsQNTaJEF+V8DpXC3x7raUFWmGhLezepQAwWOB5cnzOhYA/OGRCafTwm5 hI0RXixgt3PxDcw7a4HjR3mkJ36pZwcbI4M2xLh96aCxyUoTZqpZFiAAz+/10X6FAwm+MB R4pbACo/SWCvhvZ8Rr3Sv8/RiMqdRHvuN6EiIvTjpWOLHws/guHwpkFKl99MrUqjF9vYGv DbxuWmo8TN//a/wIpUsWCO6YpmejWyxtf6mJxQAnggdPen9yLq2uMqR6R1LHJBCo3zNpx9 Fq+XMlTEhl1Y+bvj79sPQRFJgL8O22kCBgrF01GsofqFI4X1OBPY7kzlkYsNAw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619010866; a=rsa-sha256; cv=none; b=ERPyv2VCQRA9mSw2UviOGo7S9FDZRpNOKd5OdFXxNQOTTP3XRfXrMsTb81e98tKbNT2Mui oQU4UQy+e4hr69J9odQjZDeDSzOAmBWJjT/Kcq3VxMKOwWRP44JW9rxI/3fm4VKRVfDULl z1l/3J6/DUajSbJYAZsqlwC4opHstRZilwbk87x4wF6jEQcS31wWYhD+YueImIFGPbP3hc IXIgDyLZeZu4my73XkdGE7+a87Tw27jqQi0L712MbBssgOdxZfp+T8yv4b8XCGEiAs1UgA /pHTdy4BAVCNSb6J4KYdXsYx748ZOd/VzH2c0NVE5fgvzF1VxUEbVBJ7R8ZeZw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=dm9.info header.s=dm9.info header.b="1aPQKg/v"; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.14 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=dm9.info header.s=dm9.info header.b="1aPQKg/v"; dmarc=pass (policy=none) header.from=dm9.info; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: AE91D16120 X-Spam-Score: -3.14 X-Migadu-Scanner: scn0.migadu.com X-TUID: HKQTnpJnC7xM --nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Oops, forgot to refactor. Replacement patch attached. Rationale: The elf-dynamic-info-soname function is currently implemented but unused. The current implementation does not work as it omits unwrapping the dynamic-entry record. This patch makes the function work as intended. --nFreZHaLTZJo0R7j Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-build-Fix-elf-dynamic-info-soname.patch" >From b15d9d708900f6713e5f40afdce66f3bb443e36b Mon Sep 17 00:00:00 2001 From: Dion Mendel Date: Wed, 21 Apr 2021 10:36:32 +0800 Subject: [PATCH] build: Fix elf-dynamic-info-soname. * guix/build/gremlin.scm (elf-dynamic-info-soname): Return the value of the dynamic-entry instead of the dynamic-entry record. --- guix/build/gremlin.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build/gremlin.scm b/guix/build/gremlin.scm index e8ea66dfb3..4710502426 100644 --- a/guix/build/gremlin.scm +++ b/guix/build/gremlin.scm @@ -215,7 +215,9 @@ 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 (and=> (find (matching-entry DT_SONAME) + entries) + dynamic-entry-value) (filter-map (lambda (entry) (and (= (dynamic-entry-type entry) DT_NEEDED) -- 2.31.0 --nFreZHaLTZJo0R7j--