From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wH3yOOtC2mHZ6QAAgWs5BA (envelope-from ) for ; Sun, 09 Jan 2022 03:05:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id GPzNMetC2mGA/AAAG6o9tA (envelope-from ) for ; Sun, 09 Jan 2022 03:05:31 +0100 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 72E9C3190F for ; Sun, 9 Jan 2022 03:05:31 +0100 (CET) Received: from localhost ([::1]:58166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6NaM-0004YV-Ad for larch@yhetil.org; Sat, 08 Jan 2022 21:05:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6NZu-0004XK-Ck for guix-patches@gnu.org; Sat, 08 Jan 2022 21:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6NZu-0000jY-3Z for guix-patches@gnu.org; Sat, 08 Jan 2022 21:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6NZt-0001h0-V8 for guix-patches@gnu.org; Sat, 08 Jan 2022 21:05:01 -0500 Subject: bug#52940: [PATCH] gremlin: Mimic ld.so NEEDED deduplication behavior. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 09 Jan 2022 02:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 52940 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 52940-close@debbugs.gnu.org Mail-Followup-To: 52940@debbugs.gnu.org, cmmarusich@gmail.com, cmmarusich@gmail.com Received: via spool by 52940-done@debbugs.gnu.org id=D52940.16416938666452 (code D ref 52940); Sun, 09 Jan 2022 02:05:01 +0000 Received: (at 52940-close) by debbugs.gnu.org; 9 Jan 2022 02:04:26 +0000 Received: from localhost ([127.0.0.1]:49000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6NZK-0001g0-Dj for submit@debbugs.gnu.org; Sat, 08 Jan 2022 21:04:26 -0500 Received: from mail-pl1-f175.google.com ([209.85.214.175]:41844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6NZH-0001fj-DS for 52940-close@debbugs.gnu.org; Sat, 08 Jan 2022 21:04:24 -0500 Received: by mail-pl1-f175.google.com with SMTP id z3so9100599plg.8 for <52940-close@debbugs.gnu.org>; Sat, 08 Jan 2022 18:04:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=rSJh+cMMzSiUjTLnaaesS863SqXYhjsUBh00YzQ+uYM=; b=Hb7jALTaLd/VZzI2T9tQiHlhBcFy/aUxH5zV7HFj0FMKP6M9YfvVUxcZh10eVDhUgK whTsQFeXvNGVrla4HaGJkf6/lz3cCU52AS2vJoIPTUHzs2U38bh4LzTQ/KcrTrk0NslC d+yK+E9JI1t/n53u+vpBP9Ge3HrspSUTONrTrJNXBwtv0JWorR47CcbKzPVygWvgBXNZ jqkBRd9VImxo0gdVUTiwaS5Z/lriD0VCe2BK4pitn8dS1N6PJjSOgojCZOCXtPkHFn+Q GZa1lSI/+z+q8dNZBTITTfkLBaIryFp6afWbi/UROf0FRvYSMo10Q/4rgKVUfuKX1Vln 5ygw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=rSJh+cMMzSiUjTLnaaesS863SqXYhjsUBh00YzQ+uYM=; b=RlUuYWQyRfw6sFrdmqGCwhM0FRn4IS8ztRRJU2j5bSxd3VroMY3LixjgtdZJcsR3iO 6SsrZT8uyxjQaVLDzahmADkhK3DmxUebe/dkBo1b6G/isYbuS2QDzRfyqRW/dy5BM8cg cctYzMTCFFaUPWsoekSXplRUIPhPHAucSiGXbRaAwrJHczmS1lYqByiAUSMd3K8X9ghy roJJpi0dhqi8tLtaxaURzRAxCWUnu+985QbOdH6ugQmamlRlqxt9Jn+2p3tAGem7eY4Q /SuOuVHgLX0CjvzOJ4AhnMvy9nG4ZFI6Lu4WE6glDkx8FmAnGfnDPSa3Y1bpcrcRp+xk +o5w== X-Gm-Message-State: AOAM532BrOkzbXxaL4+Co3jn8w9CACbUWrTSBg+l4d3FW44v1je07SnR tkevEKooO+MRW2KA1g8g+4dQSr8kuGI= X-Google-Smtp-Source: ABdhPJyQQl3B63WBVfYOCs+659W+f/IrZeHS7aj1+OJik2i8Mav4tejIw7ehEdyKBigZk+SWhRPlSw== X-Received: by 2002:a17:902:bd4b:b0:148:fdda:e85b with SMTP id b11-20020a170902bd4b00b00148fddae85bmr72549620plx.116.1641693856846; Sat, 08 Jan 2022 18:04:16 -0800 (PST) Received: from garuda-lan (c-24-18-44-142.hsd1.wa.comcast.net. [24.18.44.142]) by smtp.gmail.com with ESMTPSA id m9sm3000349pjk.51.2022.01.08.18.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jan 2022 18:04:16 -0800 (PST) From: Chris Marusich References: <87zgofaw2g.fsf@gmail.com> <87a6gaknml.fsf@gnu.org> Date: Sat, 08 Jan 2022 18:04:11 -0800 In-Reply-To: <87a6gaknml.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 05 Jan 2022 20:07:14 +0100") Message-ID: <87czl1hdgk.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641693931; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to: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=rSJh+cMMzSiUjTLnaaesS863SqXYhjsUBh00YzQ+uYM=; b=INgTI7kXiUupVBMyHCBJNZoYvosFkCJwA315VJuiOZxB8HQtDQLYs0e44U3l8dH7sf6xlk l8qOBHZiLgi3yEIpNlfmaFTdxxicyaJFLGqTWOCvOXoty/zzP04iXNrp6B/NMENODmvlwu 1uIG0UMiGydXEkHquioxo8idqQFj7lInez+dVI2Etg6fUWL1MwPzW/sc2oNP3AZDyy54Rl f29CGn8WKD2CdIq0WV2DIcNaVidwtE1wfxh9Iag9ncO6kyWl+41YWyV7sLwypd49h2HWX8 q67qKcQKXYCBCMsCyvONYa6oRC2E8P+FSfF41S9GRoC9a53aVymRgq/A9GK/3w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641693931; a=rsa-sha256; cv=none; b=VI/987xXkEBJweXutuvoZhp2j6mqblHZ+a5ZRLhp3Gv0wE6jSEPiUyspd0T6ArUdUa0ytS Bkm9a6Hnh84CbMZ/UM7WZ8JW/wggTTdaNcxTXnBnexgp5Hk1q4+XjA7/EQkQOmfo3E+KNE 1ipwPvdZ1enMIM1QRdPFTg/NWNVb0iGGnQxBumerk25gXOOJLK4O396TNf4evw91Eh7fBN dlFBHQDqDV+dBQ6GI979RzjcbkNEGApq0wv3UDdligBQidgJIcItyx+fDholjEwpmPoDCS 2pZx+T+47wHrr0xUo9/G6Vr9P/23UP8HCcJcVW4ZNeOf3TjxZI9VL2RWfBA79w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Hb7jALTa; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Hb7jALTa; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 72E9C3190F X-Spam-Score: -4.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: f0t7T/6zxfMs --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, Ludovic Court=C3=A8s writes: > Good catch! We could go fancy and have =E2=80=98loop=E2=80=99 in > =E2=80=98file-needed/recursive=E2=80=99 thread a map of device/inode numb= er pairs to > file names; when calling =E2=80=98search-path=E2=80=99, we=E2=80=99d chec= k whether the file we > found already is in the set, possibly under a different name, and we=E2= =80=99d > use that name instead of introducing a new one. That=E2=80=99d be more > efficient that calling =E2=80=98canonicalize-path=E2=80=99, especially O(= n=C2=B3) times > roughly. > > But=E2=80=A6 given that this is a corner case, that modifying (guix build > gremlin) entails a full rebuild, and that there just should be that > =E2=80=9C/lib/../lib=E2=80=9D entry in the first place, I=E2=80=99d lean = towards leaving > gremlin.scm unchanged. > > WDYT? > > However=E2=80=A6 > >> diff --git a/tests/gremlin.scm b/tests/gremlin.scm >> index 9af899c89a..86757e62b4 100644 >> --- a/tests/gremlin.scm >> +++ b/tests/gremlin.scm >> @@ -1,5 +1,6 @@ >> ;;; GNU Guix --- Functional package management for GNU >> ;;; Copyright =C2=A9 2015, 2018, 2020 Ludovic Court=C3=A8s >> +;;; Copyright =C2=A9 2022 Chris Marusich >> ;;; >> ;;; This file is part of GNU Guix. >> ;;; >> @@ -92,7 +93,9 @@ >> (loop result)))))) >>=20=20 >> (define ground-truth >> - (remove (cut string-prefix? "linux-vdso.so" <>) >> + (remove (lambda (entry) >> + (or (string-prefix? "linux-vdso.so" entry) >> + (string-prefix? "linux-vdso64.so" entry))) >> (read-ldd-output pipe))) >>=20=20 >> (and (zero? (close-pipe pipe)) > > =E2=80=A6 I think this part should definitely be committed (=E2=80=98mast= er=E2=80=99 is fine). I agree that the existing behavior is probably fine. It makes me feel better to know that you also think so. With that in mind, I've committed a simpler fix in 6a2050b on master that just changes the test. I've also updated the guix package two times. Now, after running "guix pull", I can once again successfully build the guix package on powerpc64le-linux. Hooray! Thank you for the review! I'll now close this bug. =2D-=20 Chris PGP: https://savannah.gnu.org/people/viewgpg.php?user_id=3D106836 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJJBAEBCAAzFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmHaQpsVHGNtbWFydXNp Y2hAZ21haWwuY29tAAoJEN1AmhXYIkadL8oQAKAkKMSQXZ2ZcoJH8i1wnEjsA63V ebcbMaX/6K0g93YzlW28hQ0pTsBrla5WS+Jb1cgL1HaQMOybGhXiTQTbM1c9TlOj Bao98VdxqM7WzLV/BGwh85dUKKCdnzU4gjbfZ3imstFPUsHhc6GgujZatQXXQ5p4 Xdg4AFgpLPCZB4Cw8HK6J/MOvppwQN0jqe1Q27uv/Rkhu780fDYWA+Ft4+4zThDV 6x95wvhaDoPnM21+H1RX/6qH6Vxzkr/prFhTND85ZXBFYHhAy85Ng+ZUg88bo7yR jLhdW0oKQAYLEZBRWvn1s4QiM/ALq3eeOZ9dUP7pFlP5XTTj8qpRpoB+gouJ78u3 VMjTDYzlZ5Shqpt2WG9WPVV9HHN5oGOcSeZlSsq+vgqV7VpK2BCv+dy1lDG1Pw1r nbQ+o5eqs+pMsELam2gvFHqO8NXUBoOvW+eOaPuVoqwiYM9Ouc+Irq1TjAIIkUzu pntOkS7/tRnP84m2k73o0eNomWqWNP5lhdUkUgI0VPfi2QhG7HhXL6m0A8IhW02e YlSN2rjyB7n76VI+321bc5KF751Mk9EighIiBE7bsMqj3AXfkq//Kz2aPYiFwq/+ OYnIhvtVvY57bRP0M6blMQnGT80KGxrG66zzD7aYGjWypJjKij9GW6qyHgCaSNPg Nr8+hAhI3zz7qonC =XwjQ -----END PGP SIGNATURE----- --=-=-=--