From unknown Sat Jun 21 03:09:51 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#76582 <76582@debbugs.gnu.org> To: bug#76582 <76582@debbugs.gnu.org> Subject: Status: [PATCH] build-system: asdf: Don't search and replace inputs when unnecessary. Reply-To: bug#76582 <76582@debbugs.gnu.org> Date: Sat, 21 Jun 2025 10:09:51 +0000 retitle 76582 [PATCH] build-system: asdf: Don't search and replace inputs w= hen unnecessary. reassign 76582 guix-patches submitter 76582 Christopher Baines severity 76582 normal tag 76582 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 05:40:15 2025 Received: (at submit) by debbugs.gnu.org; 26 Feb 2025 10:40:15 +0000 Received: from localhost ([127.0.0.1]:51169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnEpq-0003yp-GT for submit@debbugs.gnu.org; Wed, 26 Feb 2025 05:40:15 -0500 Received: from lists.gnu.org ([2001:470:142::17]:60224) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tnEoP-0003q4-TO for submit@debbugs.gnu.org; Wed, 26 Feb 2025 05:38:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnEoI-0001RH-MZ for guix-patches@gnu.org; Wed, 26 Feb 2025 05:38:38 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnEoC-0004Wu-QK for guix-patches@gnu.org; Wed, 26 Feb 2025 05:38:38 -0500 Received: from localhost (unknown [IPv6:2a0b:89c1:3::a36e]) by mira.cbaines.net (Postfix) with ESMTPSA id 456AD27BBE2 for ; Wed, 26 Feb 2025 10:38:31 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7ac534fc for ; Wed, 26 Feb 2025 10:38:30 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] build-system: asdf: Don't search and replace inputs when unnecessary. Date: Wed, 26 Feb 2025 10:38:30 +0000 Message-ID: <0f2dc8c640c7b1709729d1d16911206fd9aff98f.1740566310.git.mail@cbaines.net> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) If the new-name matches the original name, just use the original package. This avoids situations where there are several packages matching the name and the behaviour will be inconsistent, occasionally picking different packages. Since there are multiple glibc packages currently, I'm seeing this behaviour with cl-posix-mqueue and ecl-cl-posix-mqueue, occasionally they'll use the hurd glibc variant. * guix/build-system/asdf.scm (package-with-build-system): Use the original input packages unless the new-name differs. Change-Id: I08a1f3ad1290689b5497d31950ada4dc0bfa3a3a --- guix/build-system/asdf.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 26b5a5008a..ad0fb993f6 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -155,9 +155,13 @@ (define* (package-with-build-system from-build-system to-build-system (define (find-input-package pkg) (let* ((name (package-name pkg)) - (new-name (transform-package-name name)) - (pkgs (find-packages-by-name new-name))) - (if (null? pkgs) #f (list-ref pkgs 0)))) + (new-name (transform-package-name name))) + (if (string=? name new-name) + pkg + (let ((pkgs (find-packages-by-name new-name))) + (if (null? pkgs) + #f + (list-ref pkgs 0)))))) (define transform (mlambda (pkg) base-commit: 90ee330bafc5a95493f9cdae2e32ddf740104ebc -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 08:39:21 2025 Received: (at 76582) by debbugs.gnu.org; 26 Feb 2025 13:39:21 +0000 Received: from localhost ([127.0.0.1]:51540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnHdA-0001ZD-Fy for submit@debbugs.gnu.org; Wed, 26 Feb 2025 08:39:20 -0500 Received: from mout02.posteo.de ([185.67.36.66]:34553) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tnHd5-0001Yn-U5 for 76582@debbugs.gnu.org; Wed, 26 Feb 2025 08:39:17 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 86674240103 for <76582@debbugs.gnu.org>; Wed, 26 Feb 2025 14:39:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1740577149; bh=4YGRGkd6hCgShUbdAOW/O2HC9VzHlDWXlZRhNSnpt5Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=dq72c6+eGEtpdwFnh2Ls4NYUWb0+xwPXNw1xB3zUwJPGJkh4fBIxSRbpGBxsWqFyE 7vsiegowsD5f5WzPVIqjq0JiCDfQd7Tv+TEekgOCd5BmcqDiES1XUQaksfAIxWtHux BcDliuDhGsbbNRzRKRrApt2QJK1HzsyvWI6lfjS/bfOrjzOAJsyuCRgyQcUz+cyFdO cDpGAaJUe0cFOn6b7s806Q0S8JRBMXuOZmaUCp+sAIJa3gIYAwsTQ3Xdq/nJpctMBy +RlwqnhJUFvKLSc6Qvvvabjvhf/dOJAdml+y5h3tQRZuJzg9lZR5afXnNcY1fMUeaP S6qGKSEY0apZw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Z2wYS6l07z9rxF; Wed, 26 Feb 2025 14:39:08 +0100 (CET) From: Guillaume Le Vaillant To: Christopher Baines Subject: Re: [bug#76582] [PATCH] build-system: asdf: Don't search and replace inputs when unnecessary. In-Reply-To: <0f2dc8c640c7b1709729d1d16911206fd9aff98f.1740566310.git.mail@cbaines.net> (Christopher Baines's message of "Wed, 26 Feb 2025 10:38:30 +0000") References: <0f2dc8c640c7b1709729d1d16911206fd9aff98f.1740566310.git.mail@cbaines.net> Date: Wed, 26 Feb 2025 13:39:08 +0000 Message-ID: <87ldtsygeb.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 76582 Cc: 76582@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Christopher Baines skribis: > If the new-name matches the original name, just use the original package. > This avoids situations where there are several packages matching the name= and > the behaviour will be inconsistent, occasionally picking different packag= es. > > Since there are multiple glibc packages currently, I'm seeing this behavi= our > with cl-posix-mqueue and ecl-cl-posix-mqueue, occasionally they'll use the > hurd glibc variant. > > * guix/build-system/asdf.scm (package-with-build-system): Use the original > input packages unless the new-name differs. > > Change-Id: I08a1f3ad1290689b5497d31950ada4dc0bfa3a3a > --- > guix/build-system/asdf.scm | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm > index 26b5a5008a..ad0fb993f6 100644 > --- a/guix/build-system/asdf.scm > +++ b/guix/build-system/asdf.scm > @@ -155,9 +155,13 @@ (define* (package-with-build-system from-build-syste= m to-build-system >=20=20 > (define (find-input-package pkg) > (let* ((name (package-name pkg)) > - (new-name (transform-package-name name)) > - (pkgs (find-packages-by-name new-name))) > - (if (null? pkgs) #f (list-ref pkgs 0)))) > + (new-name (transform-package-name name))) > + (if (string=3D? name new-name) > + pkg > + (let ((pkgs (find-packages-by-name new-name))) > + (if (null? pkgs) > + #f > + (list-ref pkgs 0)))))) >=20=20 > (define transform > (mlambda (pkg) > > base-commit: 90ee330bafc5a95493f9cdae2e32ddf740104ebc Yes, that seems logical. I have not yet tried recompiling packages with this patch, but visually it looks good to me. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCZ78ZfA8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j+FpgD/efSaIqUjmN73KDXfjFX/71yKNODS2BHWn0yD /zEKMdMA/0PpYk0qB0tk4XFQL27YbSUdWYj3JGU4zdMGxgSUeIms =Sa1V -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 03 09:33:28 2025 Received: (at 76582-done) by debbugs.gnu.org; 3 Mar 2025 14:33:28 +0000 Received: from localhost ([127.0.0.1]:46863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tp6rI-0007aO-1V for submit@debbugs.gnu.org; Mon, 03 Mar 2025 09:33:28 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:55197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tp6rF-0007aE-0Y for 76582-done@debbugs.gnu.org; Mon, 03 Mar 2025 09:33:26 -0500 Received: from localhost (unknown [IPv6:2a02:6b67:e390:8b00::1ce5]) by mira.cbaines.net (Postfix) with ESMTPSA id 9E93727BBE2; Mon, 3 Mar 2025 14:33:23 +0000 (GMT) Received: from fang (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id da360b9a; Mon, 3 Mar 2025 14:33:23 +0000 (UTC) From: Christopher Baines To: Guillaume Le Vaillant Subject: Re: [bug#76582] [PATCH] build-system: asdf: Don't search and replace inputs when unnecessary. In-Reply-To: <87ldtsygeb.fsf@kitej> (Guillaume Le Vaillant's message of "Wed, 26 Feb 2025 13:39:08 +0000") References: <0f2dc8c640c7b1709729d1d16911206fd9aff98f.1740566310.git.mail@cbaines.net> <87ldtsygeb.fsf@kitej> Date: Mon, 03 Mar 2025 14:33:23 +0000 Message-ID: <87eczew5e4.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76582-done Cc: 76582-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Guillaume Le Vaillant writes: > Christopher Baines skribis: > >> If the new-name matches the original name, just use the original package. >> This avoids situations where there are several packages matching the nam= e and >> the behaviour will be inconsistent, occasionally picking different packa= ges. >> >> Since there are multiple glibc packages currently, I'm seeing this behav= iour >> with cl-posix-mqueue and ecl-cl-posix-mqueue, occasionally they'll use t= he >> hurd glibc variant. >> >> * guix/build-system/asdf.scm (package-with-build-system): Use the origin= al >> input packages unless the new-name differs. >> >> Change-Id: I08a1f3ad1290689b5497d31950ada4dc0bfa3a3a >> --- >> guix/build-system/asdf.scm | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm >> index 26b5a5008a..ad0fb993f6 100644 >> --- a/guix/build-system/asdf.scm >> +++ b/guix/build-system/asdf.scm >> @@ -155,9 +155,13 @@ (define* (package-with-build-system from-build-syst= em to-build-system >>=20=20 >> (define (find-input-package pkg) >> (let* ((name (package-name pkg)) >> - (new-name (transform-package-name name)) >> - (pkgs (find-packages-by-name new-name))) >> - (if (null? pkgs) #f (list-ref pkgs 0)))) >> + (new-name (transform-package-name name))) >> + (if (string=3D? name new-name) >> + pkg >> + (let ((pkgs (find-packages-by-name new-name))) >> + (if (null? pkgs) >> + #f >> + (list-ref pkgs 0)))))) >>=20=20 >> (define transform >> (mlambda (pkg) >> >> base-commit: 90ee330bafc5a95493f9cdae2e32ddf740104ebc > > Yes, that seems logical. I have not yet tried recompiling packages with > this patch, but visually it looks good to me. Thanks for taking a look, with the minimal testing I've done locally it seems OK, so I've pushed this as 15615db61b106c6e77cfabe042edb9e77d578c95. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmfFvbNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XenyBAAj9edYNHqKZ9nvmJzY97deiz8vSN6Wcf3 pn8wKCVR604VRC2c5iPx6dj0G4uYZpu3MmwBIwbT0Kpjx+ZRtmleV6+xs93cEJPD q0ttA2iDSPtVj2UTG8hubiAbrMZX8ZzHipnj9a+9Vs38iPHCrhC48q8/wcIuPphK 8+Asaj2G2UyVdajmYwzn2ZFhTnKKSqH3VL2+XW0hTGI1yseh/vIRiKX/63JlHTLz ksuEBdEbPSnHhrO63vquan+NSLmg1aEVqr6EL8GIO4OTymlb74Wh6jNORqJE+obd ewzna+TgTLizlX5Ec7O7YDF7k+GZ5VQwoBfMq0q2HIUvYDZ+JOkGFJdkdzT3SY3Z oRQfUIP382kyLvFyl1Lp0BHP//8Xo3c/gPJ1BY3CO7Dd6drDQukGAmBhdiEfvDc8 6QzugeW0PvWAGN6+pSSH7RQ1bYbtoQjurfW1QV6A7W3PZ3o+JlYSb1aN/AmMnUYF a8dbBTdMQkBbLrDyEa3wFQBfjRIeOL2QSiM+1d/KnOhSs9fZcXfXpUd3DMqmCmv/ 7csDFiw9qKq/kF2FG1JyUxwHEqBJyWp3vRcoSNlVqr/ofxQS9Ws5c0Zkfiptkz/R Ycx1YAc9BWPEJTiejHk7Z2fdH9LavFiSSpBHECDkB4Zrtxuiec1X8/D+oCtUIwtM bpTxazH0iwA= =YqDS -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 21 03:09:51 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 01 Apr 2025 11:25:28 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator