From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id DWVyGU7ugGAUmwAAgWs5BA (envelope-from ) for ; Thu, 22 Apr 2021 05:32:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +LrtE07ugGD3egAAbx9fmQ (envelope-from ) for ; Thu, 22 Apr 2021 03:32:30 +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 F34332BC18 for ; Thu, 22 Apr 2021 05:32:29 +0200 (CEST) Received: from localhost ([::1]:33474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZQ4r-0003Jl-0v for larch@yhetil.org; Wed, 21 Apr 2021 23:32:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZPza-0000jf-OB for guix-patches@gnu.org; Wed, 21 Apr 2021 23:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48733) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZPza-0008DJ-Gm for guix-patches@gnu.org; Wed, 21 Apr 2021 23:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZPza-0001PC-CD for guix-patches@gnu.org; Wed, 21 Apr 2021 23:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47921] Include correct commit message 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: Thu, 22 Apr 2021 03:27:02 +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.16190619805355 (code B ref 47921); Thu, 22 Apr 2021 03:27:02 +0000 Received: (at 47921) by debbugs.gnu.org; 22 Apr 2021 03:26:20 +0000 Received: from localhost ([127.0.0.1]:60279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZPyt-0001OI-Ud for submit@debbugs.gnu.org; Wed, 21 Apr 2021 23:26:20 -0400 Received: from cornsilk.ash.relay.mailchannels.net ([23.83.222.40]:57538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZPyo-0001O4-KT for 47921@debbugs.gnu.org; Wed, 21 Apr 2021 23:26:18 -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 9E2055425EA for <47921@debbugs.gnu.org>; Thu, 22 Apr 2021 03:26:10 +0000 (UTC) Received: from pdx1-sub0-mail-a31.g.dreamhost.com (100-96-11-138.trex.outbound.svc.cluster.local [100.96.11.138]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id A7A11542516 for <47921@debbugs.gnu.org>; Thu, 22 Apr 2021 03:26:09 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|smtp@dm9.info Received: from pdx1-sub0-mail-a31.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.11.138 (trex/6.2.1); Thu, 22 Apr 2021 03:26:10 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|smtp@dm9.info X-MailChannels-Auth-Id: dreamhost X-Madly-Stretch: 4ba55f854d0b6471_1619061970341_3644672098 X-MC-Loop-Signature: 1619061970341:4198421244 X-MC-Ingress-Time: 1619061970341 Received: from pdx1-sub0-mail-a31.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a31.g.dreamhost.com (Postfix) with ESMTP id 5E1BA8623F for <47921@debbugs.gnu.org>; Wed, 21 Apr 2021 20:26:09 -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=1e Zrl/39rGOTmtEYF7zioi3n5Mk=; b=TPoQPGQQZxcsRMo8B/QtrKQLWteOkTBdVt t7l+SHqLBggQwOky+S7nkkFf52udyK6j+Z+ZT0t/fACKg18JIf6nIQP7+0BdSgtl EXppFQu3Q+zPqnNcb+uF8QrfTVNhfUtLojbHvu2QIqfbrYUpkkUnM3IB+Z8Vu74p LiGoAcnqg= 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-a31.g.dreamhost.com (Postfix) with ESMTPSA id 1F3E07F0E6 for <47921@debbugs.gnu.org>; Wed, 21 Apr 2021 20:26:08 -0700 (PDT) Received: by mail.localdomain (Postfix, from userid 2001) id 95BD34FFA72; Thu, 22 Apr 2021 11:26:05 +0800 (AWST) Date: Thu, 22 Apr 2021 11:26:05 +0800 X-DH-BACKEND: pdx1-sub0-mail-a31 From: Dion Mendel Message-ID: <20210422032605.GA3138@dm9.info> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="6c2NcOVqGQ03X4Wi" 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-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=1619062350; 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=LIyeAm21HbhDPR5BHPQz83qbU2MYJMBmx9Qbm7rQSGk=; b=jFUXCzawIAfkHQWHE4iv4BkXVP+FANCN+VhTOvaTRvErNss7JEjI68v0IS1yWHHjLZxYrW DvvblzEpQrRISfaK91XrqkuE5Jk5Y1bOTUDkeFhyQyDiThdRwDrZiMPhUNDcIDlVQJCnDA D+83n8xRoxTpLVqqIrp4cFa1Rqo7vwdpyBy0XiruIypQwgVSz65dpLZ5rpq2zNEP1kdsRl UbpG+kQubjcS8GjC+l47E9a3xNprvsnLirLvVKBA8n7lmpDUNVGb1yt5liv0hpKb2ZhiTa xf8HB9wyXGfeFLAGxCQwvH8XPbmrfLrOafygH8mHkdIRU9Wh3AlAQ/XWkcIVuw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619062350; a=rsa-sha256; cv=none; b=oitoScZGvms7Wcb+v5rZiyITOAj/SnIhMqs3ziioLiln7sXpKLE7aLAAGWgYKrqAkHPQG/ q7YXkG8viUq2fqcVt1RuEOD9EIwRY7xprwyi5Of9BJLLgN4eJvareXS5PfYlDrtOZzAA+K pvCbLR9RjO6wTZ2+j40XCgRH7Jv+hiIhMyPRc8BJeTJJYXVF98JpsVEmV4QgesRIx3CSnn noNN3SY37bkeW/IcVHLznET96sZbhXf8cluiNUGzy1i1u9N0kD7ljGBJ8hjQaBdCeTC4Xp TU+KPa/FOtC0ikn7xehkxxRpzSS+ILnbCwDAjLBhBxjx3C0xIszwK7jPOxTMLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dm9.info header.s=dm9.info header.b=TPoQPGQQ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=dm9.info (policy=none); 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: 0.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dm9.info header.s=dm9.info header.b=TPoQPGQQ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=dm9.info (policy=none); 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: F34332BC18 X-Spam-Score: 0.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: eWhtvvvaLT3I --6c2NcOVqGQ03X4Wi Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Correct changelog message. --6c2NcOVqGQ03X4Wi Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-build-Fix-elf-dynamic-info-soname.patch" >From c9df762924ac28bc7cab6c7c1f9acda0db378f7e Mon Sep 17 00:00:00 2001 From: Dion Mendel Date: Thu, 22 Apr 2021 11:21:35 +0800 Subject: [PATCH] build: Fix elf-dynamic-info-soname. * guix/build/gremlin.scm (elf-dynamic-info): Correctly set the value of soname in . --- guix/build/gremlin.scm | 4 +++- tests/gremlin.scm | 18 ++++++++++++++++++ 2 files changed, 21 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) diff --git a/tests/gremlin.scm b/tests/gremlin.scm index b0bb7a8e49..50ad0d70f5 100644 --- a/tests/gremlin.scm +++ b/tests/gremlin.scm @@ -96,4 +96,22 @@ (close-pipe pipe) str))))))) +(unless c-compiler + (test-skip 1)) +(test-equal "elf-dynamic-info-soname" + "libfoo.so.2" + (call-with-temporary-directory + (lambda (directory) + (with-directory-excursion directory + (call-with-output-file "t.c" + (lambda (port) + (display "// empty file" port))) + (invoke c-compiler "t.c" + "-shared" "-Wl,-soname,libfoo.so.2") + (let* ((dyninfo (elf-dynamic-info + (parse-elf (call-with-input-file "a.out" + get-bytevector-all)))) + (soname (elf-dynamic-info-soname dyninfo))) + soname))))) + (test-end "gremlin") -- 2.31.0 --6c2NcOVqGQ03X4Wi--