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: 60432 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 9BB3027BBE9; Fri, 16 Feb 2024 15:13:07 +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 A7A7F27BBE2 for ; Fri, 16 Feb 2024 15:13:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raztX-0006f2-7U; Fri, 16 Feb 2024 10:12:55 -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 1raztO-0006bw-ON for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -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 1raztM-00034G-VG for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raztf-0004Jn-5j; Fri, 16 Feb 2024 10:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 4/7] gnu: emacs: Disable jit compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13:03 +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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809633816493 (code B ref 67260); Fri, 16 Feb 2024 15:13:03 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:18 +0000 Received: from localhost ([127.0.0.1]:59899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsw-0004Hr-5U for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:18 -0500 Received: from mail-lj1-f178.google.com ([209.85.208.178]:49656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsq-0004Gd-EX for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:13 -0500 Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2d11d17dddeso11776961fa.3 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096247; x=1708701047; 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=SeQWVzW6yWPwtZebz2m7ZYWWFHD+CipowjkHoTE6rnPT/L0NWRwhaTOlMpxp/RWBNv 4JwohJW8+ELRCtABHFZo9/dbUGEMGstS+oJOxqn8fpINlGWdwVKDMVfBEpHPtkK8xg+f obB/eJ0XtbewmR+CPqNTQ0dpdGKiwwxPZdHtsg1CBBFTXaAv2ekB7wFhNK70UADdKLq6 4dF7COrgKeMStR2QqzgC3rLU//k4pMIMfs+TRDKqy4PMvWi+5f0vZQDPjlSuN0VxM3CK QMxeyI1mhsDOsRrEK1Bxx4ol5zxAUT3V5HMBWnBi9bhOSCXbdADE1mY5pi9g96ddpD/z 5KpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096247; x=1708701047; 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=qN8NPI5W2RrWLgKhR/YQRnY5rFgURyzrxx07pXpQpw5kztMxFHNZo7oHZ3H6X42OSr Assw52Hf0cpYUAw0iB0YC78hPOpybw1d1uhOYy1QTdXWzF5SMEScq2neiF99WhUCvzH/ obZrfC9P03D8d4IbwOTYArPFvaNGuAilusRhgi/+nR3M0SgN8bcAgWuhWqsfwrHKBYB8 CcnEF2HrXaPU/dsdKFGRpLC/l66/6vew1UkYmP/BPHPHFeOFnZiu0ckOuwTlongP0hpQ kLb+QgrKFVpXZQT0ZaawqAoOI2e15mhs6t4jls1KjMniUiSeirRreRuK0vHxOCXaiKCL 0GBQ== X-Gm-Message-State: AOJu0YzENuI9hCvC0pNzp9tVuxaqM1uNxBnXpGW38eb9QfvDsxxFnmv1 vxARoZiUzFBhPPTmRRcotk+sHqb/gpOaoQ5mXivU5+jvG9MpZ/2iDMYhvAQ+ X-Google-Smtp-Source: AGHT+IFf51Zy78FqMg5rnWczbMB61NLK4YVccQbrw7F4C3IrwAyAewCoWYPceFokXqi8TocM9PGF8Q== X-Received: by 2002:a2e:8290:0:b0:2d2:1fed:8029 with SMTP id y16-20020a2e8290000000b002d21fed8029mr436425ljg.28.1708096247182; Fri, 16 Feb 2024 07:10:47 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:46 -0800 (PST) Message-ID: 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");