From patchwork Mon Feb 24 22:56:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 39128 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9E36127BBE2; Mon, 24 Feb 2025 22:58:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2485E27BBE9 for ; Mon, 24 Feb 2025 22:58:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmhOt-0004KM-8w; Mon, 24 Feb 2025 17:58:11 -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 1tmhOp-0004JZ-GE for guix-patches@gnu.org; Mon, 24 Feb 2025 17:58:07 -0500 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 ) id 1tmhOp-0005X5-6d for guix-patches@gnu.org; Mon, 24 Feb 2025 17:58:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Idb/CIOBAKtYqjQE+4Yfq7IMMR8YWDE5ic1Cpxre5Jw=; b=JpWaFQ57fw3QHvzWsIwSdLWCisdegNS8LsWyJlUV32DVGJaJugFegq4ipjMh5Nu0eB21MkVjSokU9gVx5SpEsQ8jjHrYBIdc9Mg/oMiDBChPmfMOzpjjo8j2ph3qfGZxLz3tzGRU+w+w7MPiiMNkSZF+Iakfp8IX5RnneHGjPqGCBVQFuN2QnHl2MM1J+8XjOzXdoHUzHT1vpJ/Tq3NpQ2VKka4sKbjIFx2Lhmer3KSMAH6/mMekIYY4nw2el7bs+9fmW5DGI4osb/45MVRo2fDWDZQQI1uAbzW+zgXxBnTOwYtev161VLWv+nuciqh7HD/WqQV4D9sJaB6xayVQjA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmhOn-0006ax-MU; Mon, 24 Feb 2025 17:58:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76529] [PATCH 2/4] gnu: emacs-next: Update to 31.0.50-0.60232a3. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, divya@subvertising.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 24 Feb 2025 22:58:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76529 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76529@debbugs.gnu.org Cc: Morgan Smith , Andrew Tropin , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 76529-submit@debbugs.gnu.org id=B76529.174043785725265 (code B ref 76529); Mon, 24 Feb 2025 22:58:05 +0000 Received: (at 76529) by debbugs.gnu.org; 24 Feb 2025 22:57:37 +0000 Received: from localhost ([127.0.0.1]:43322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmhOK-0006ZK-CS for submit@debbugs.gnu.org; Mon, 24 Feb 2025 17:57:37 -0500 Received: from mail-dm6nam10olkn20813.outbound.protection.outlook.com ([2a01:111:f403:2c13::813]:23840 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tmhO5-0006YK-2F for 76529@debbugs.gnu.org; Mon, 24 Feb 2025 17:57:22 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ApNBY52bZIoklJ+9v5JOHv1wrMF2t3Z+78hogP0Agpo3rttBR9ZpQBWBWiPwli9oMCn8IuEs0ahRtLUQvhmOEdXolMvC9QeYb9/O2PMKhernjT9OdxZmQ6ZMIr+WN7rm1UhSg5IAgQ14nefKI6mwFc2QOs8Uc0ToqNEVULCysmOth/W4zP8W9pX9hwb2oZSxtBTCt1mgw+i/iS6rJ5c3t4NzIxu8jF0vTyEJt6btTKuZ7+L9/OMF7q3+dv8+U/xiGrH7chz2hQxmSyd4T59bNkDpko6Oxprgoxhfce69kk74Rt5MfFvYRdKDBmCYZDxE78hXKVpKGvH8GF091+Bpdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Idb/CIOBAKtYqjQE+4Yfq7IMMR8YWDE5ic1Cpxre5Jw=; b=cZtkQuGRU5sEPnGpc2zL+EuQhY1avYgnRS7S5VFUma0wBx3kSMRB9GTvE8+eD/ukiZra5iDza9KLOq0f9jUbSIs2b5hcmzdNEySOn3XvzWamv8OUNMRBC/giia57NJeWyEu53ltY1zIYTVA0gaERkBIJy3j6yoG4fMTYVbkLj4tYsb++ohYNMXNN/1ptcDUOwZiHnzGRiUPn/jTgnc28mt5bALby0L37xgHDzjG8UhnZZQp46aZGu6fKdzwJqo+JyIN2Hec77dhz3BoJIYa4B2GY+vXgCYqDoCw/J22GpZbAZWgXK/HmQhnMMDTE8r7qo0beSOs2X0NIInTxam0fLg== 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=Idb/CIOBAKtYqjQE+4Yfq7IMMR8YWDE5ic1Cpxre5Jw=; b=E2qw3dJqw5UGaaOCWsB/nqMlLdP5WIn5QTfH78uuL3jz+j8D+tPAlN1sh97rLdsdg3JOnSNT8LItRDAA9ruhcSpZJ5gGcXYncbxX/ugCC+nzoGpIOcd0UnzCcngDo6PuSS9PuntJcfCD2frQ2Eaoa6teTO2gD3FrF/E+r/mYiqyA/WHVqJvbotOFB+KkW5ajU26vO9jLD8YfKnhoSi2m+p4/NxpxhfN7aC/uKT7328dp9FTOHzLuZeDu0qq5/7bOZ4gvetyRD6SiiPsMOzJ+UX1GyWsYg7ppdcsN+taEA5kggX+uwYplSPHMXiyVcxXCHaAhdz/HNtCUoo7A2EcptQ== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by IA1PR84MB3107.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:208:3e9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 22:57:15 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%4]) with mapi id 15.20.8466.016; Mon, 24 Feb 2025 22:57:15 +0000 From: Morgan Smith Date: Mon, 24 Feb 2025 17:56:24 -0500 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <40b8619dfc96d3e730bffd30d7f4ebb2e3610019.1740437785.git.Morgan.J.Smith@outlook.com> References: <40b8619dfc96d3e730bffd30d7f4ebb2e3610019.1740437785.git.Morgan.J.Smith@outlook.com> X-ClientProxiedBy: YQBPR0101CA0225.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:66::6) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|IA1PR84MB3107:EE_ X-MS-Office365-Filtering-Correlation-Id: 9410b644-a349-4616-a115-08dd55269496 X-Microsoft-Antispam: BCL:0; ARA:14566002|7092599003|5072599009|461199028|15080799006|6090799003|8060799006|19110799003|1602099012|3412199025|4302099013|440099028|10035399004|12071999003|21061999003|41001999003|12091999003|1710799026; X-Microsoft-Antispam-Message-Info: 0C+xNWWErL/by7uG9oM/hl2WKAsVWCIbh6fyzWhEPjMiFgxQUgEMILnq0MmfUsmRApeaI4xLTGK1qxLZ20CtAIomdmLAACNx2oPXTX0DTls7MW2/6CMTxOZBBym2+61qmOkvxskcBm+MMvMn27KUA0vdkxN4MVID47M982gzMVH7mGTIew1+HRV0fNO0PEhyXSxOz6Ygph+05bh6cdPGwd25oUJRh/CrM+t1hDOD2NqbrirbX94rhyuhcvdCwZY2h/zTmK7ajKg8fNRkH0IKos+5GC3hLydHEZT3GZi1tTcalicah1O0oF+k4s99wXSRnjHq0mVwYTID2YaCJRRCtizxvgvGnrWeDMxUs+3zn+SxiWBYNNUM0REmXQov8qsPJ9iLuLFm1C+z3csDp4FZ0oN+YJD4kwUMKT3C4MK/5sm2JgmCq5rWgvS266AowntSb+0UYRmaFQr7pZ9BRurmIloICTjwDkhFiYBDlgj+Do9aEWmZdQkW0nLWYMgxz+f0L+vLOw5clLn0DqtGdJMFRvvVoBpoO5OS2UAWOrzd9RWmdImoYsWdbsQcEuwgT0PUe9/4ERIBcGseT1YmpqzA2t57K9tCVJVQWIVHq6mTRWu5iXTJz9s80zH056jGxFgYddxkDcdzrTrxVpwGH2Bmk8sr3PNZi0mX+kzYsKimJ2FOTQyOeSdti/84H6xM5AG01iOM/Y97LcUgYn0OZUDc9wRiTNyt20o7zTw2TuvEHDGXqnDnnnF8Kz9n87wpwVXj5AEpazJRFovKKux+Um5zP3JMTF/nXWHUYz3ZqRovoyo3pdE2+JIbfrqKh4iog8Tyr4nAWIOP4vJc9mP91EXlqcIoIAMe4YNyBfg+H9YARsBkG4uVX2uoDK4VpuZuCFjd0hrcxnPIt0JwTwO8umrNmeOHXAC23PJRiE2wmkzKyaTeLvYyNwysqsjBIHpS2lrCrMWZjbUqIVz3okOXpgkfHrkA80KuZEAM53Dp9ty93jJ/tSmddMu/BOfSpv+/AacwZDjX7KAVkijeF8R2TCmczkoRJrzR79i+rh1vGOhjHmoahCc2jkXNnIN8JCm2CksvDdbgG590GjPMV2ovliwNTovSdlQuzKXTmL25J7Rqly8MSRcvo9+/IPvIINaL8Y3GicijGqiy8QCSNoYp1aXTpC2i542Rrym7KF5yGiRXfudk2M8ZthNor5OAukRCXCV+OqRFPXIp2JIpxmtIFwq5QpiF2IcG6MbrajcUjtZaH5e1/Vvw9Xg2eKFvB9rNcKKZzAcSUnvSEeT60R0hTODovhWalItOCOPvg2dz9R5Lrrc4h+xJBoVJAOAM/YvyXnnFSh80wLjiKElFJS4j5mHR4T7Ei5yf57VuEhlRpk6ghDvT6X20oRX4ybmWSTkj5Y1i X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M+OK22/wpsNfMJQdEd86w9islM/S5diJfmj7X0D0KmQRXBO5aUpBEfbarFAJDuQ27MDi83PL+ozSNDoTab/MytoLN1bv1ROhkATgK97PIDXCRN1Z/lAVqcoCr/MyT3SZ/YSCbj/4NeWKzB/psGOtCQo2m2DNNrN+CniJ3WtJbVboVRfz+E6HJKXpIr5wRQD2fuWxKfx8JLjilMzEYY3rmYZUDar8/Ty1S+SAzjeqCPQWPzhaZB0a2IwJsv81zifIbXtXv5EY6z8lKPHmqbzQJc25hRm+ZYWCdJfA5GGSHhsSoXl9xGjFcabzgrWjX1smiR3KJ59UxYPL00bExXJUnJJK+KKHwleO4vWzOu9sDSRVrBUUjqmX0pnIVqxMH7BheepGOo9wWNiqpTk0JD6UdvpggJFIG5HUOXXhwWVEvXtCjRF19W9cIezkIKcWaI78VrSGAH1zwPqJN2jOWRti/8iiYCFPkPxMHmLNe958w/pQRvm7Uz15jnwX7foBpozmOQ6jT47Fm0MnkB5uYWUAueHShMSXHQZgcksbpJ/OiK2NeVjv+BSX2tmEvCH35sucIShgfFHXNUXofabyDtoH0GDqSy/TPs1SR3JIm/GzGP9mnPUW/aw9WUOAkyIq/wIWpiofbyyvxctIIWwfP4b1Xw7t+dcjfMuOY/bRpti7rE7geXRJHEw+8eO8TDKS/b0JgZ2uXtQQYEDmi+U0+HRXSiYj/9Om5tNM7FLVOEfmWLFRFvjJszbpr5vYK8ZmNykxPsqyrc/wYd6iQTklPGkXIUO1YYm8R3FXFeEKanEnFzbYO30wCEog4KwS9Id807lQupHCkVeN8Irlpk3kyVWbP430n9vLeGOCPzoDsAp+Phqg9A8BqTLmTAoNtV5P9IHyxmHu8LGjYnaCckJUG7YjMEhzb5ua5yHag/P/D7ptWf75cxuJ941aV2N+su70dh2+r/ABo5oz/4oWpsZFYcOJ+xEMUqmvrxpGZEdOyEft/jXD2A7Ykq1kZUZ7+Yg/5G9Da4eFmgS8IiYMF2XcagX08Jluyxw8WGrzrAs2Pa82VSvoK9PfcGJRNpxdYiSobh/M/QqsDG17B1/fOjmxuaXRCeZQj1a933tUXkQFurLu4HqnEjDglkbG/9ZJ9bsVSD3X2KHjbnnvVNeOuSfMNeO4jEDeyNFU42PW7jH1jnIWMc85D2AZgQG5xVElu6qpHKPWvEJsWA33N1k4iYCGgKXfsYEc09MoMCSl2/ZTrwmQbpqdEmDS8OMVvi4lMIG3xgGs X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9410b644-a349-4616-a115-08dd55269496 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 22:57:15.0251 (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: IA1PR84MB3107 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-next-minimal): Update to 31.0.50-0.60232a3. * gnu/packages/patches/emacs-next-exec-path.patch: Regenerate. * gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch: Regenerate. * gnu/packages/patches/emacs-next-native-comp-driver-options.patch: Delete. * gnu/local.mk: Remove deleted patch. Change-Id: Id89d7445a978566139b7c0a7d15f8c5eac2d111e --- gnu/local.mk | 1 - gnu/packages/emacs.scm | 10 +- .../patches/emacs-next-exec-path.patch | 28 +- ...macs-next-native-comp-driver-options.patch | 18 - ...emacs-next-native-comp-fix-filenames.patch | 325 +++++++++--------- 5 files changed, 189 insertions(+), 193 deletions(-) delete mode 100644 gnu/packages/patches/emacs-next-native-comp-driver-options.patch diff --git a/gnu/local.mk b/gnu/local.mk index 45a9cb635e..48711dc385 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1229,7 +1229,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-native-comp-pin-packages.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ - %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4d14feb38b..5de87720b4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -572,12 +572,12 @@ (define-public emacs-wide-int #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "881d593a9879f3355733f1b627af7cc0c12b429e") + (let ((commit "60232a30e360c00fb303cb033d4aec15a9e41342") (revision "0")) - (package + (package (inherit emacs-minimal) (name "emacs-next-minimal") - (version (git-version "30.0.92" revision commit)) + (version (git-version "31.0.50" revision commit)) (source (origin (method git-fetch) @@ -586,12 +586,12 @@ (define-public emacs-next-minimal (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0nj3a7wsl5piqf6a8wnmfyjbpxp2dwl0r48flv9q624jx4nxfr2p")) + (base32 "1n1i20j92a8sqv224yzvyzk804h9x0lgyp3jlny3b6g08ka91034")) (patches (search-patches "emacs-disable-jit-compilation.patch" "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" - "emacs-next-native-comp-driver-options.patch" + "emacs-native-comp-driver-options.patch" "emacs-next-native-comp-fix-filenames.patch" "emacs-native-comp-pin-packages.patch" "emacs-pgtk-super-key-fix.patch"))))))) diff --git a/gnu/packages/patches/emacs-next-exec-path.patch b/gnu/packages/patches/emacs-next-exec-path.patch index 6e33e25258..d815301578 100644 --- a/gnu/packages/patches/emacs-next-exec-path.patch +++ b/gnu/packages/patches/emacs-next-exec-path.patch @@ -1,18 +1,24 @@ -Do not capture the build-time value of $PATH in the 'emacs' executable -since this can noticeably increase the size of the closure of Emacs -with things like GCC being referenced. +Do not capture the build-time value of $PATH in the 'emacs' +executable since this can noticeably increase the size of the closure of +Emacs with things like GCC being referenced. +--- + lisp/loadup.el | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -Index: emacs-next/lisp/loadup.el -=================================================================== ---- emacs-next.orig/lisp/loadup.el -+++ emacs-next/lisp/loadup.el -@@ -599,7 +599,8 @@ lost after dumping"))) - ((equal dump-mode "dump") "emacs") - ((equal dump-mode "bootstrap") "emacs") - ((equal dump-mode "pbootstrap") "bootstrap-emacs.pdmp") +diff --git a/lisp/loadup.el b/lisp/loadup.el +index 9089da9a988..3d1b9e45dd1 100644 +--- a/lisp/loadup.el ++++ b/lisp/loadup.el +@@ -603,7 +603,8 @@ comp-subr-arities-h + (if (eq system-type 'ms-dos) + "b-emacs.pdmp" + "bootstrap-emacs.pdmp")) - (t (error "Unrecognized dump mode %s" dump-mode))))) + (t (error "Unrecognized dump mode %s" dump-mode)))) + (exec-path nil)) (when (and (featurep 'native-compile) (equal dump-mode "pdump")) ;; Don't enable this before bootstrap is completed, as the +-- +2.48.1 + diff --git a/gnu/packages/patches/emacs-next-native-comp-driver-options.patch b/gnu/packages/patches/emacs-next-native-comp-driver-options.patch deleted file mode 100644 index e4ed5a48f1..0000000000 --- a/gnu/packages/patches/emacs-next-native-comp-driver-options.patch +++ /dev/null @@ -1,18 +0,0 @@ -We substitute this anyway, so let's make it easier to substitute. - ---- a/lisp/emacs-lisp/comp.el -+++ b/lisp/emacs-lisp/comp.el -@@ -203,9 +203,7 @@ and above." - :type '(repeat string) - :version "28.1") - --(defcustom native-comp-driver-options -- (cond ((eq system-type 'darwin) '("-Wl,-w")) -- ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) -+(defcustom native-comp-driver-options nil - "Options passed verbatim to the native compiler's back-end driver. - Note that not all options are meaningful; typically only the options - affecting the assembler and linker are likely to be useful. --- -2.38.0 - diff --git a/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch index 7897fa9b04..830d58cc00 100644 --- a/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch +++ b/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch @@ -11,12 +11,163 @@ way into the actual variable despite attempts to remove it by calling ‘startup--update-eln-cache’. The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as packages may require it, but only pushes the new value now. +--- + lisp/loadup.el | 38 ++++++++------ + lisp/startup.el | 27 ---------- + src/Makefile.in | 1 + + src/comp.c | 134 +++++++++++++++++++----------------------------- + 4 files changed, 78 insertions(+), 122 deletions(-) -Index: emacs-next/src/comp.c -=================================================================== ---- emacs-next.orig/src/comp.c -+++ emacs-next/src/comp.c -@@ -4403,26 +4403,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc +diff --git a/lisp/loadup.el b/lisp/loadup.el +index 3d1b9e45dd1..398ecfd519e 100644 +--- a/lisp/loadup.el ++++ b/lisp/loadup.el +@@ -53,6 +53,14 @@ + (setq redisplay--inhibit-bidi t) + + (message "Dump mode: %s" dump-mode) ++;; Compensate for native-comp-eln-load-path being empty by Guix' default. ++(and (featurep 'native-compile) ++ dump-mode ++ (setq ++ native-comp-eln-load-path ++ (cons (expand-file-name "../native-lisp" invocation-directory) ++ native-comp-eln-load-path) ++ comp-file-preloaded-p t)) + + ;; Add subdirectories to the load-path for files that might get + ;; autoloaded when bootstrapping or running Emacs normally. +@@ -522,27 +530,25 @@ load--fixup-all-elns + directory got moved. This is set to be a pair in the form of: + \(rel-filename-from-install-bin . rel-filename-from-local-bin)." + (when (and load--bin-dest-dir load--eln-dest-dir) +- (setq eln-dest-dir +- (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/")) ++ (setq load--eln-versioned-dest-dir ++ (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/")) + (maphash (lambda (_ cu) + (when (stringp (native-comp-unit-file cu)) + (let* ((file (native-comp-unit-file cu)) +- (preloaded (equal (substring (file-name-directory file) +- -10 -1) +- "preloaded")) +- (eln-dest-dir-eff (if preloaded +- (expand-file-name "preloaded" +- eln-dest-dir) +- eln-dest-dir))) ++ (native-lisp-needle ++ (regexp-quote (concat "native-lisp/" ++ comp-native-version-dir "/")))) + (native-comp-unit-set-file + cu + (cons + ;; Relative filename from the installed binary. +- (file-relative-name (expand-file-name +- (file-name-nondirectory +- file) +- eln-dest-dir-eff) +- load--bin-dest-dir) ++ (file-relative-name ++ (expand-file-name ++ (save-match-data ++ (string-match native-lisp-needle file) ++ (substring file (match-end 0))) ++ load--eln-versioned-dest-dir) ++ load--bin-dest-dir) + ;; Relative filename from the built uninstalled binary. + (file-relative-name file invocation-directory)))))) + comp-loaded-comp-units-h))) +@@ -609,7 +615,9 @@ comp-subr-arities-h + (equal dump-mode "pdump")) + ;; Don't enable this before bootstrap is completed, as the + ;; compiler infrastructure may not be usable yet. +- (setq native-comp-enable-subr-trampolines t)) ++ (setq native-comp-enable-subr-trampolines t ++ ;; We loaded everything we could. ++ comp-file-preloaded-p nil)) + (message "Dumping under the name %s" output) + (condition-case () + (delete-file output) +diff --git a/lisp/startup.el b/lisp/startup.el +index c240fbbe28a..f038ace6695 100644 +--- a/lisp/startup.el ++++ b/lisp/startup.el +@@ -520,9 +520,6 @@ native-comp-eln-load-path + (defvar native-comp-jit-compilation) + (defvar native-comp-enable-subr-trampolines) + +-(defvar startup--original-eln-load-path nil +- "Original value of `native-comp-eln-load-path'.") +- + (defun startup-redirect-eln-cache (cache-directory) + "Redirect the user's eln-cache directory to CACHE-DIRECTORY. + CACHE-DIRECTORY must be a single directory, a string. +@@ -533,22 +530,10 @@ startup-redirect-eln-cache + For best results, call this function in your early-init file, + so that the rest of initialization and package loading uses + the updated value." +- ;; Remove the original eln-cache. +- (setq native-comp-eln-load-path (cdr native-comp-eln-load-path)) +- ;; Add the new eln-cache. + (push (expand-file-name (file-name-as-directory cache-directory) + user-emacs-directory) + native-comp-eln-load-path)) + +-(defun startup--update-eln-cache () +- "Update the user eln-cache directory due to user customizations." +- ;; Don't override user customizations! +- (when (equal native-comp-eln-load-path +- startup--original-eln-load-path) +- (startup-redirect-eln-cache "eln-cache") +- (setq startup--original-eln-load-path +- (copy-sequence native-comp-eln-load-path)))) +- + (defun startup--rescale-elt-match-p (font-pattern font-object) + "Test whether FONT-OBJECT matches an element of `face-font-rescale-alist'. + FONT-OBJECT is a font-object that specifies a font to test. +@@ -1385,12 +1370,6 @@ command-line + startup-init-directory))) + (setq early-init-file user-init-file) + +- ;; Amend `native-comp-eln-load-path', since the early-init file may +- ;; have altered `user-emacs-directory' and/or changed the eln-cache +- ;; directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + ;; If any package directory exists, initialize the package system. + (and user-init-file + package-enable-at-startup +@@ -1525,12 +1504,6 @@ command-line + startup-init-directory)) + t) + +- ;; Amend `native-comp-eln-load-path' again, since the early-init +- ;; file may have altered `user-emacs-directory' and/or changed the +- ;; eln-cache directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + (when (and deactivate-mark transient-mark-mode) + (with-current-buffer (window-buffer) + (deactivate-mark))) +diff --git a/src/Makefile.in b/src/Makefile.in +index 8296329f136..13f1cb2eeda 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -567,6 +567,7 @@ shortlisp := + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS = + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. +diff --git a/src/comp.c b/src/comp.c +index 36c45f1315d..e9d1bce555b 100644 +--- a/src/comp.c ++++ b/src/comp.c +@@ -4279,26 +4279,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fcomp_el_to_eln_rel_filename, Scomp_el_to_eln_rel_filename, 1, 1, 0, doc: /* Return the relative name of the .eln file for FILENAME. FILENAME must exist, and if it's a symlink, the target must exist. @@ -49,7 +200,7 @@ Index: emacs-next/src/comp.c if (NILP (Ffile_exists_p (filename))) xsignal1 (Qfile_missing, filename); -@@ -4430,64 +4421,55 @@ one for the file name and another for it +@@ -4306,64 +4297,55 @@ DEFUN ("comp-el-to-eln-rel-filename", Fcomp_el_to_eln_rel_filename, filename = Fw32_long_file_name (filename); #endif @@ -131,7 +282,7 @@ Index: emacs-next/src/comp.c + + if (!NILP (bogus_dirs)) + { -+ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ tail = CALLNI (split-string, bogus_dirs, build_string (":")); + + FOR_EACH_TAIL_SAFE (tail) + { @@ -157,7 +308,7 @@ Index: emacs-next/src/comp.c } DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, -@@ -4501,13 +4483,7 @@ If BASE-DIR is non-nil, use it as the di +@@ -4377,13 +4359,7 @@ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, non-absolute BASE-DIR is interpreted as relative to `invocation-directory'. If BASE-DIR is omitted or nil, look for the first writable directory in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory @@ -172,21 +323,21 @@ Index: emacs-next/src/comp.c (Lisp_Object filename, Lisp_Object base_dir) { Lisp_Object source_filename = filename; -@@ -4555,10 +4531,11 @@ the latter is supposed to be used by the +@@ -4431,10 +4407,11 @@ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, Lisp_Object lisp_preloaded = Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); + bool preloaded = comp_file_preloaded_p; if (comp_file_preloaded_p || (!NILP (lisp_preloaded) -- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- && !NILP (Fmember (CALLNI (file-name-base, source_filename), - Fmapcar (intern_c_string ("file-name-base"), -+ && !NILP (Fmember (CALL1I (file-name-sans-extension, source_filename), ++ && !NILP (Fmember (CALLNI (file-name-sans-extension, source_filename), + Fmapcar (intern_c_string ("file-name-sans-extension"), - CALL1I (split-string, lisp_preloaded)))))) + CALLNI (split-string, lisp_preloaded)))))) base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); -@@ -5875,10 +5852,7 @@ The last directory of this list is assum +@@ -5741,10 +5718,7 @@ syms_of_comp (void) the system *.eln files, which are the files produced when building Emacs. */); @@ -198,148 +349,6 @@ Index: emacs-next/src/comp.c DEFVAR_LISP ("native-comp-enable-subr-trampolines", Vnative_comp_enable_subr_trampolines, -Index: emacs-next/lisp/startup.el -=================================================================== ---- emacs-next.orig/lisp/startup.el -+++ emacs-next/lisp/startup.el -@@ -527,9 +527,6 @@ DIRS are relative." - (defvar native-comp-jit-compilation) - (defvar native-comp-enable-subr-trampolines) - --(defvar startup--original-eln-load-path nil -- "Original value of `native-comp-eln-load-path'.") -- - (defun startup-redirect-eln-cache (cache-directory) - "Redirect the user's eln-cache directory to CACHE-DIRECTORY. - CACHE-DIRECTORY must be a single directory, a string. -@@ -540,22 +537,10 @@ to `user-emacs-directory'. - For best results, call this function in your early-init file, - so that the rest of initialization and package loading uses - the updated value." -- ;; Remove the original eln-cache. -- (setq native-comp-eln-load-path (cdr native-comp-eln-load-path)) -- ;; Add the new eln-cache. - (push (expand-file-name (file-name-as-directory cache-directory) - user-emacs-directory) - native-comp-eln-load-path)) - --(defun startup--update-eln-cache () -- "Update the user eln-cache directory due to user customizations." -- ;; Don't override user customizations! -- (when (equal native-comp-eln-load-path -- startup--original-eln-load-path) -- (startup-redirect-eln-cache "eln-cache") -- (setq startup--original-eln-load-path -- (copy-sequence native-comp-eln-load-path)))) -- - (defun startup--rescale-elt-match-p (font-pattern font-object) - "Test whether FONT-OBJECT matches an element of `face-font-rescale-alist'. - FONT-OBJECT is a font-object that specifies a font to test. -@@ -1383,12 +1368,6 @@ please check its value") - startup-init-directory))) - (setq early-init-file user-init-file) - -- ;; Amend `native-comp-eln-load-path', since the early-init file may -- ;; have altered `user-emacs-directory' and/or changed the eln-cache -- ;; directory. -- (when (featurep 'native-compile) -- (startup--update-eln-cache)) -- - ;; If any package directory exists, initialize the package system. - (and user-init-file - package-enable-at-startup -@@ -1523,12 +1502,6 @@ please check its value") - startup-init-directory)) - t) - -- ;; Amend `native-comp-eln-load-path' again, since the early-init -- ;; file may have altered `user-emacs-directory' and/or changed the -- ;; eln-cache directory. -- (when (featurep 'native-compile) -- (startup--update-eln-cache)) -- - (when (and deactivate-mark transient-mark-mode) - (with-current-buffer (window-buffer) - (deactivate-mark))) -Index: emacs-next/lisp/loadup.el -=================================================================== ---- emacs-next.orig/lisp/loadup.el -+++ emacs-next/lisp/loadup.el -@@ -53,6 +53,14 @@ - (setq redisplay--inhibit-bidi t) - - (message "Dump mode: %s" dump-mode) -+;; Compensate for native-comp-eln-load-path being empty by Guix' default. -+(and (featurep 'native-compile) -+ dump-mode -+ (setq -+ native-comp-eln-load-path -+ (cons (expand-file-name "../native-lisp" invocation-directory) -+ native-comp-eln-load-path) -+ comp-file-preloaded-p t)) - - ;; Add subdirectories to the load-path for files that might get - ;; autoloaded when bootstrapping or running Emacs normally. -@@ -538,27 +546,25 @@ This to have it working when installed o - directory got moved. This is set to be a pair in the form of: - \(rel-filename-from-install-bin . rel-filename-from-local-bin)." - (when (and load--bin-dest-dir load--eln-dest-dir) -- (setq eln-dest-dir -- (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/")) -+ (setq load--eln-versioned-dest-dir -+ (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/")) - (maphash (lambda (_ cu) - (when (stringp (native-comp-unit-file cu)) - (let* ((file (native-comp-unit-file cu)) -- (preloaded (equal (substring (file-name-directory file) -- -10 -1) -- "preloaded")) -- (eln-dest-dir-eff (if preloaded -- (expand-file-name "preloaded" -- eln-dest-dir) -- eln-dest-dir))) -+ (native-lisp-needle -+ (regexp-quote (concat "native-lisp/" -+ comp-native-version-dir "/")))) - (native-comp-unit-set-file - cu - (cons - ;; Relative filename from the installed binary. -- (file-relative-name (expand-file-name -- (file-name-nondirectory -- file) -- eln-dest-dir-eff) -- load--bin-dest-dir) -+ (file-relative-name -+ (expand-file-name -+ (save-match-data -+ (string-match native-lisp-needle file) -+ (substring file (match-end 0))) -+ load--eln-versioned-dest-dir) -+ load--bin-dest-dir) - ;; Relative filename from the built uninstalled binary. - (file-relative-name file invocation-directory)))))) - comp-loaded-comp-units-h))) -@@ -644,7 +650,9 @@ directory got moved. This is set to be - (equal dump-mode "pdump")) - ;; Don't enable this before bootstrap is completed, as the - ;; compiler infrastructure may not be usable yet. -- (setq native-comp-enable-subr-trampolines t)) -+ (setq native-comp-enable-subr-trampolines t -+ ;; We loaded everything we could. -+ comp-file-preloaded-p nil)) - (message "Dumping under the name %s" output) - (condition-case () - (delete-file output) -Index: emacs-next/src/Makefile.in -=================================================================== ---- emacs-next.orig/src/Makefile.in -+++ emacs-next/src/Makefile.in -@@ -591,6 +591,7 @@ shortlisp := $(filter-out ${shortlisp_fi - ## We don't really need to sort, but may as well use it to remove duplicates. - shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) - export LISP_PRELOADED = ${shortlisp} -+export NATIVE_COMP_BOGUS_DIRS = - lisp = $(addprefix ${lispsource}/,${shortlisp}) - - ## Construct full set of libraries to be linked. +-- +2.48.1 +