Message ID | CH3PR84MB3424B66223D97660AD97AFDAC5E52@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9099627BBE2; Wed, 8 May 2024 19:50:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 132F727BBE9 for <patchwork@mira.cbaines.net>; Wed, 8 May 2024 19:50:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1s4mMG-000693-Au; Wed, 08 May 2024 14:49:40 -0400 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 <Debian-debbugs@debbugs.gnu.org>) id 1s4mMC-00068L-Ry for guix-patches@gnu.org; Wed, 08 May 2024 14:49:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1s4mMC-0002CV-Jb for guix-patches@gnu.org; Wed, 08 May 2024 14:49:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1s4mMc-0001fo-3M for guix-patches@gnu.org; Wed, 08 May 2024 14:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. Resent-From: Morgan Smith <morgan.j.smith@outlook.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 May 2024 18:50:02 +0000 Resent-Message-ID: <handler.70632.B70632.17151941766420@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70632 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler <liliana.prikler@gmail.com> Cc: Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>, 70632@debbugs.gnu.org, Andrew Tropin <andrew@trop.in> Received: via spool by 70632-submit@debbugs.gnu.org id=B70632.17151941766420 (code B ref 70632); Wed, 08 May 2024 18:50:02 +0000 Received: (at 70632) by debbugs.gnu.org; 8 May 2024 18:49:36 +0000 Received: from localhost ([127.0.0.1]:50301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1s4mMB-0001fU-LP for submit@debbugs.gnu.org; Wed, 08 May 2024 14:49:36 -0400 Received: from mail-bn1nam02olkn2049.outbound.protection.outlook.com ([40.92.15.49]:48894 helo=NAM02-BN1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <morgan.j.smith@outlook.com>) id 1s4mM7-0001fO-6j for 70632@debbugs.gnu.org; Wed, 08 May 2024 14:49:34 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=luO94GlNQILZlKf1rgpFs/+FeAY5q3Axr3IfqCxuvovSY67/pcd0OxlZUpXy2+Z7JRzo4xraj/mTKXCS5zIgxY0YyuDfbx8SIfKS3c1E67HrIbcAvxTN+csqvJbRAtauMvLfrbbSxArgwA9xT5HG6rYd60U2rOFpyPFGT6ehKpE+1G9t8qAzykLz0hOuONt2Y77bnSzn5NU43FIvuRiuny60q6ctEPPBUOIPwXhc16mrlzOPdw+1AzAAj9y3EuV08NBSh6eqpIpVsntbgiP5K6U/RGEDtA8PZXtOR3MplEDFdeV8E65p1x3zGP4ej77nhXLZZohQ56H4+uzjA0jnKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CiNSD7trwVXZKeui6KsJg/KPr1KSPzrACqGOfd2YLZw=; b=Ob3TdFa5MoiVBkNW9y3ZrBbb3eqZ4SC60vO+Yy75EVDDIaljggCJC5X4WVqFvJ7zVVmPq9C6wEf1sUfxAu/OaHvSzfqMU7l9XAUB8FT3AEM654pNisd0ICcwjkM+UlW28oYzuCYpB0MffrUC256LDw2wibpy1I7rQt3QIr4UD0cP4VrHfL138HBGHDR50xd4QNho/FFiyQArzTiTTucJ8xOXi6n+ftEGXypOGqFsa+9ZdMc+yYTPNXQldCXOVrarE10UmpXBjSN+IFQ9Be8eNLzdeSGgfBZjiYWX5ZGcoe8ZSeO7XlNoo5PgSLzQ3GqWhfJMNXjZprRUG0zWvnRcMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CiNSD7trwVXZKeui6KsJg/KPr1KSPzrACqGOfd2YLZw=; b=pBKbf+fw+uF9Al0/QKckolnEZ0cntksw44OSKilVg6/VWLpjEzV8ERhSARCmAqJyta4tr7ucvPIk63Q5C4bqDLerOIKVEoztbejnu3i9uX6rAH+yUNZB7VcI13pJp4Eqyjhq8ce/axr3MRL9tmYyfaXjOnny6m/YgKVck+9MLNqOAFqwYBvy/9WH+fhD2YlTJiHGFg83A/oabAy+6lZ26ihw4FmBk8W2XblXEm0A/1ybOU/RgnXYgGV1D4gPpMnHuernzLtJzsBzuQdjuY58n0D/PGzQvFI6WQCmy9OiEkKGcTne0PsZYOfdDgkdifEaHmvkqtwSmojmM+jkGDsSvw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SJ0PR84MB1361.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:a03:381::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Wed, 8 May 2024 18:48:57 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7544.045; Wed, 8 May 2024 18:48:56 +0000 From: Morgan Smith <morgan.j.smith@outlook.com> In-Reply-To: <518c80a73207138ede449fb24c72ac4b79764b1e.camel@gmail.com> (Liliana Marie Prikler's message of "Thu, 02 May 2024 06:24:00 +0200") References: <CH3PR84MB3424497FCBC7281536D266D0C5142@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM> <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> <CH3PR84MB3424CB88BCC92AECD7E838B3C51B2@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM> <cb1611ac9414e4d0b0366d8f31bd41a3f300931a.camel@gmail.com> <CH3PR84MB3424627A6255F9DE51EF37B5C5192@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM> <632d44c7dda06b0441f8c0ba88f47ea745c7f202.camel@gmail.com> <CH3PR84MB34248523A04EC53481BB9740C5192@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM> <518c80a73207138ede449fb24c72ac4b79764b1e.camel@gmail.com> X-Hashcash: 1:20:240508:liliana.prikler@gmail.com::rJq6Ql/Dwrf8sHs9:9A/ X-Hashcash: 1:20:240508:andrew@trop.in::kY17AO8oAUQLx8ph:ZXR X-Hashcash: 1:20:240508:cox.katherine.e+guix@gmail.com::iLIDt6XVBQXZUIeG:0sQ0 X-Hashcash: 1:20:240508:70632@debbugs.gnu.org::LF6VcPP3UJtkt3bL:2dO9 Date: Wed, 08 May 2024 14:48:55 -0400 Message-ID: <CH3PR84MB3424B66223D97660AD97AFDAC5E52@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM> User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [4zMHAARR//QW9em1ZYvEmiUXM+6S0n1s] X-ClientProxiedBy: QB1P288CA0012.CANP288.PROD.OUTLOOK.COM (2603:10b6:c00:2d::25) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <87frusm960.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SJ0PR84MB1361:EE_ X-MS-Office365-Filtering-Correlation-Id: ae6b7dac-2603-4435-2d3e-08dc6f8f83fa X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|6092099003|56899024|440099019|3412199016; X-Microsoft-Antispam-Message-Info: wrQf9nCfHjk23Hftqi7XD7CPS8sZorrXPq1WoEFXiKesS5UhSmslCG0s4pmFxXC2nNH8ead7A580drmILkgZlln6eplcez4QcxQQUMk3v2E+fOqULwUwC7JjFpM6x9lerqmSmVP9EyqXb+KxF9uYbHsfrjnOLD+VEq9vAunJzsZZL9cYzM8qSpafuqwIMyAeR9vq1ekPoYZLgJpAua+fHeaKiH6vY9BtklqB2gUGKrvpXC5UnwjxNJAhYEWpl6BA8G4EEVDuGGzpJBa42lC+a8TI4cMT5SmiAycmXkVWoogwArfROUwtZetVVMfyZXHMcmmWwRx3yFyQ0lkOBqP6ecQUL3SYXy7dSVGmCF8CaTo15MgHGfhnvbSSE4hBAytDjjAhaB+Q+G2IMUb8WPNXwn+nm+vAmc2DuCNt1ClwMw/hhOBrWn+qK6qIrIjVQbULvWaO5xOgFyrgufICaNV1KIrbUGAlxFVMptD9OZIZlowkPN3cQvAdHBSWr/hRMxSeCpCp5bTDgLc7H7daRtkA9TmgTKa4uiRClmhakpRAtPnSbSroN+HcH1bKZmvVXjfKDtQzdgTO69qQvnsmV0t4JoZkW9034Op01MLmZjMzWE3KYcWP0WNeu/qmDJFfwszk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AepntA916hcoZLoHtO4cHOa4KgxrHhzt5MFJX4m3/iRfVhB9Mzui+Fjc/vtimOjHITgCkewjjsCI3bg22f2XJNWCUIsdmKyANQyKZdO1Gxjvi1wJzR3QDau8rndRc1tIPUFgnc60vymbwyrmoGsbaN8GJs1atMMGGB4G1d1L2ejYv/sjaLIOHjt9rSvnaxM1s0XmOFtGkBJxaKtj/9QyuWLJTM2+G6Nm2Knk6Y3kW/67qhfInAe6Fi1OqMD9bYoSZg8PHBhegAj9Ow2/k9suFVW6N6qAvdbPva4Ec+4BGce6nE+E9eCaBj4BXp641bzqkPms00Rtezg0Pjsftq/x8nzlv6h4FNPp92hPq9pPzwUwMORh7XXm+KYR389rs5BbBTu3p3LhLrrHQViO0izScsg+PqW9Ii2Ac47Cc+fjYZnULsOSj4EvXb2IIwCBh5SK+41VcQuS7gn9mPZ1h2tV5U0G5HgZoFOlyXZJ36yvUckpC1/TI6T7kz62VC4ijtSjsv5Jv+jigt/tvjmZeMeMRG2/YPElIfQkItbXqodGtpsZu7gpp26mhjtik4gaHeqfAtfXamQwKop35Y/r5rlqiVIeXaWTSy9paTJoElukkV7V2DtNdAPM3jc7gcNVbM8W9zgvTO0R5zNjpXdcmqbnN7tBZiTPcMHPgtYI7SD6ygmg67c/yb5vf11XbnlOJmIMPlnlVazs8tQdYbrLk/GUoFbI2SdbKQRrpekqZEtzromGFNzwMw9A/LdBUtc8LGu8w/ve5q4+cqEh54QAzHImnEMeEeIjTNOVhowbc1Emw051ykYwmDUxU/EQhDOGv2V+RvHSIbDDc6m3QLsQgnAB+6UysJv5FBGOUkeuOVaaKpr35sBCmPFKsH0ey36upUNlFdnfVRnoMzjOYw0JhuMmnIMcG5FmlejrLMEV87TphcI6+P+I6DFVcmhjDUQtNvpsOG+IvElatRYpCmIzTXmErHSGZA7N05GUxz7/z2DmejHxL4UgJJzvGnpPuV/2lZ0yf/GKLSTKcGAUUVsi8yupueNyGIoEmHZQ6aoYbWAPeoYl/Bg67XMsZ9D4IdfiVWfzREJKvxptWFdJuVOgovoIDZw0MkXPCHNYWLWxXyM+ffEfHMkeJP2EQEnsGay1QxBBfURAGWuYBnrTciRBsEshyEOVZyZ9ZvSxJw4I9sH4LVHCNZ/U+y+byb0t9bFRXoHXgM07+j6OHSCh0wGhI4o1QM293W5yUdj3UvJgqs7ZVPz5hefLSrF5aUTsPeErF8j9 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae6b7dac-2603-4435-2d3e-08dc6f8f83fa X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2024 18:48:56.7907 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR84MB1361 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
Series |
[bug#70632,1/2] aux-files: comp-integrity: Adjust for newer emacs.
|
|
Commit Message
Morgan Smith
May 8, 2024, 6:48 p.m. UTC
Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Mittwoch, dem 01.05.2024 um 16:06 -0400 schrieb Morgan Smith: > TL;DR: If we do a new file or a phase, we only rebuild emacs-next. If > we modify the file in-place, we rebuild emacs, because it uses it. > Between a phase and a new file, a new file is preferable, because we > can then 'mv' it over the old one. I apologize. In my mind we where talking about two different changes at the same time. A change to emacs-next right now, and a change that would rebuild all of emacs but live on a branch for now. I still think that's the optimal route. Apply the phase patch right now to main, and then the file modification to some branch. On a related note, I do have two changes I'd like to make when we rebuild all of emacs. I've attached the changes to this mail despite it not being quite the right place to send them. Also I didn't actually test them because I don't really want to rebuild all of that myself. >> In guix/build/emacs-utils.scm:emacs-generate-autoloads, there is a >> condition to support emacs 28. I don't think we ever use that path >> anymore but it is nice to have a robust function that "just works". >> Espiaclly back when we did have emacs 28 and 29 packages in guix. > This is somewhat legacy code that has grown that way back when Emacs 29 > was emacs-next. There was no good reason to drop it with the switch, > but come Emacs 30, 31, and maintainability might be one. My issue isn't that you're wrong, but rather I would argue "it's not a big deal". To maintain clean minimal code we should remove that condition and so I see your point. But also, it is such a small addition of code that adds significant backwards compatibility to the function.
Comments
Am Mittwoch, dem 08.05.2024 um 14:48 -0400 schrieb Morgan Smith: > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > > Am Mittwoch, dem 01.05.2024 um 16:06 -0400 schrieb Morgan Smith: > > TL;DR: If we do a new file or a phase, we only rebuild emacs-next. > > If we modify the file in-place, we rebuild emacs, because it uses > > it. Between a phase and a new file, a new file is preferable, > > because we can then 'mv' it over the old one. > > I apologize. In my mind we where talking about two different changes > at the same time. A change to emacs-next right now, and a change > that would rebuild all of emacs but live on a branch for now. > > I still think that's the optimal route. Apply the phase patch right > now to main, and then the file modification to some branch. I've recently pushed an update to master that has a new integrity check for emacs-next; using emacs-next intrinsics rather than going through help-fns. Thus marking this as done. > On a related note, I do have two changes I'd like to make when we > rebuild all of emacs. I've attached the changes to this mail despite > it not being quite the right place to send them. Also I didn't > actually test them because I don't really want to rebuild all of that > myself. Sorry for the late review on those, but you might want to revisit them and send them as a new patch series. > + (message "Compiling `%s'") That doesn't look right. > [PATCH 1/2] build-system/emacs: Allow usage of > #:{allowed/disallowed}-references key > > * guix/build-system/emacs.scm (emacs-build): Pass #:allowed- > references and > > Change-Id: Ib9a35a7b2115365b96675fb7ca3914b0ae7e67c7 > #:disallowed-references keys to builder. The references are actually being ignored here. Cheers
From 32ba147bbccaa21524487f2fa216cf1f4a18d884 Mon Sep 17 00:00:00 2001 Message-ID: <32ba147bbccaa21524487f2fa216cf1f4a18d884.1715193630.git.Morgan.J.Smith@outlook.com> In-Reply-To: <bfb0492b28dddd69bc894de278b5ccbd0d12bd33.1715193630.git.Morgan.J.Smith@outlook.com> References: <bfb0492b28dddd69bc894de278b5ccbd0d12bd33.1715193630.git.Morgan.J.Smith@outlook.com> From: Morgan Smith <Morgan.J.Smith@outlook.com> Date: Wed, 8 May 2024 14:40:00 -0400 Subject: [PATCH 2/2] guix: emacs-utils: Be more verbose in build phase. * guix/build/emacs-utils.scm (emacs-compile-directory): Display the filename of each file before compiling. Change-Id: I275a086ed92f7cfb2907aea9b4feb59012cc8dd5 --- guix/build/emacs-utils.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index aeb364133a..f35d9e690f 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -146,6 +146,7 @@ (define* (emacs-compile-directory dir) 'comp--write-bytecode-file))))) (mapc (lambda (file) + (message "Compiling `%s'") (let (byte-to-native-output-buffer-file ;; First entry is the eln-cache of the homeless shelter, ;; second entry is the install directory. -- 2.41.0