From patchwork Tue Feb 13 18:30:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 60285 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 4E25927BBE2; Tue, 13 Feb 2024 19:33:02 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 710DC27BBE9 for ; Tue, 13 Feb 2024 19:32:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyW8-0007vL-Pa; Tue, 13 Feb 2024 14:32:32 -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 1rZyVX-0007r0-KT for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:58 -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 1rZyVN-0004Gf-F3 for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVf-0004Fy-0F for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 4/7] gnu: emacs: Disable jit compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Feb 2024 19:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170785268416263 (code B ref 67260); Tue, 13 Feb 2024 19:32:02 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:24 +0000 Received: from localhost ([127.0.0.1]:47409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV1-0004EE-R6 for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:24 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:50398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUv-0004Cv-TL for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:18 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a38271c0bd5so597782966b.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852594; x=1708457394; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=A3DWsjBZx9+0/R70FWM+AN91HMhqnnh9kiwU+sBIaTK08pdUUy65OUxzYBP21wQmvk F7b260fNE0Q+Tn5BbPzC5f60dgLoe7YzpXTnlYqswuxVdmEyp2EEN3RTxWw1b414D596 lApXoqb2nLBTmP7mI2OxciWjlt1eHNEEeqeEEtxHgLcJkACz6ogTNBwg6ZIdpMkSB4J5 abkZe6tgA6bFAEbbQCZj65X7itDsZxCA08Fl/BuxzuGs62WpxbcJ06MAMr+90Lg4oUPG NbjHIcD4IBkZxwVSvC86GmhZLi3TAqSpR3hRmMqvU+JeW/QwHTIyLi88bn9zJEQ7ZeBk b9sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852594; x=1708457394; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=dXH6IbvblAcOFd3B+FNBtcwhJR3wQY0n5pgwKdBX9hhKvXaFsU1k9dg1MZgu5Lyb+B FlL0ByDRtFjNCF5NmfZgY7peKXuqPLN2MotTp/ZMTBfu++sj9oFBlZlBkIDUeDoYGrzJ 4OsUz/TFjb+rgwmjnh5hduNtyDw/yoIsNQ98XEWCp4xX+SnmaNCwFtjDvWOxqp5InYmu uHca26BzlLeRjGVIo3+qijW2JTPShbMqfPD/exmlNpNjS1bxIHXJCXcuwWDbWDPuz4ht MLHITpnf99gi9XyCtVnNBQwg2b4ZF0BtijV1UKvl7FS4Dxc6ynE58xHoNXtT6rRvKbl7 maOw== X-Gm-Message-State: AOJu0Yz7g9U+Yv7i9yzu8nxnMK387LZRqr2s8MdGjxbutMbwsgo/LehB p8AM26vN/9Jhkm11x/1yrXQOwMIMYQ4GgMht4WmRi945g9tUDv3+fIDaU3RIcg0= X-Google-Smtp-Source: AGHT+IG/2anms+UQ6gr2OBbHpcTAS8r9N00PDt8WAjnPERshcV6H3kfJ8rggSi60O38tjmY3syzRmg== X-Received: by 2002:a17:906:eb50:b0:a3d:765:7bdc with SMTP id mc16-20020a170906eb5000b00a3d07657bdcmr236089ejb.25.1707852594374; Tue, 13 Feb 2024 11:29:54 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUMAHHx8VzazGN/Z7CGqUi0hl+d61cmEMDvwv1qTFxv0kcjA39BANNvDy0ZMqlyUwG9rhfgOOSNaxwzf5d7x7q8DZL2PeI5+jgsMxNxy9/bd/EsYbSUIRZz9MBR1zzP Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:54 -0800 (PST) Message-ID: <2188ddbfcdabbba12df18a4c3af34b123ea8448d.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 MIME-Version: 1.0 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/patches/emacs-disable-jit-compilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[patches]: Use it here. --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 3 ++- .../emacs-disable-jit-compilation.patch | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-disable-jit-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7e6a0c5006..9121f13b39 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1112,6 +1112,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-elpy-dup-test-name.patch \ + %D%/packages/patches/emacs-disable-jit-compilation.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1caa2cbee0..03c50eba6d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -108,7 +108,8 @@ (define-public emacs-minimal (sha256 (base32 "1p3h4sz8da8vhix5140g2qkdy8mz11d7mmvsym5vy847k1428gbx")) - (patches (search-patches "emacs-exec-path.patch" + (patches (search-patches "emacs-disable-jit-compilation.patch" + "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" "emacs-native-comp-fix-filenames.patch" diff --git a/gnu/packages/patches/emacs-disable-jit-compilation.patch b/gnu/packages/patches/emacs-disable-jit-compilation.patch new file mode 100644 index 0000000000..8b1ac5a9df --- /dev/null +++ b/gnu/packages/patches/emacs-disable-jit-compilation.patch @@ -0,0 +1,19 @@ +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -5648,8 +5648,12 @@ For internal use. */); + doc: /* If non-nil, compile loaded .elc files asynchronously. + + After compilation, each function definition is updated to use the +-natively-compiled one. */); +- native_comp_jit_compilation = true; ++natively-compiled one. This variable is enabled by default upstream, ++but disabled in Guix to better make use of precompiled packages. ++Notably, Guix removes the hashes that prevent inadvertent shadowing ++frm the file names of compiled libraries in order to facilitate grafts. ++Enable at your own risk! */); ++ native_comp_jit_compilation = false; + + DEFSYM (Qnative_comp_speed, "native-comp-speed"); + DEFSYM (Qnative_comp_debug, "native-comp-debug");