From patchwork Sun Jan 21 14:09:47 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: 59375 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 9E42F27BBEA; Thu, 25 Jan 2024 09:31:57 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,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 AE6DE27BBE2 for ; Thu, 25 Jan 2024 09:31:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4n-0008Pu-7J; Thu, 25 Jan 2024 04:31:13 -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 1rSw4c-0008Nt-8x for guix-patches@gnu.org; Thu, 25 Jan 2024 04:31:02 -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 1rSw4Y-00021B-Ou for guix-patches@gnu.org; Thu, 25 Jan 2024 04:31:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSw4e-0007cl-F7; Thu, 25 Jan 2024 04:31:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 7/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: Thu, 25 Jan 2024 09:31:04 +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: 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.170617503129217 (code B ref 67260); Thu, 25 Jan 2024 09:31:04 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:31 +0000 Received: from localhost ([127.0.0.1]:47328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw46-0007b5-So for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:31 -0500 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:48134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3x-0007ZY-PL for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:22 -0500 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-55a349cf29cso7566453a12.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175010; x=1706779810; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=OA29NptUxBNkZIVra/eXzJBTvLr0/QQLAzN6tpsCQmtI9giG9mEct3xIdKwCrz8AFt VxB+BPSTpS8BR/LNAE8RS58Yr838Me8nmz03l5OxWfLJ8Gwfrq19CYwJJpSqmS6Ey1OJ v3LtMVWGos4GxNJJI36iDamMSuF6QD6t8P+ioP4lFPhyA3ZkwTw4lFGnESLE3o5WfTTv V8FolswhLqQtnuzpD3KNb8fYl4kX1jhI39+igvRJa5AmXuupbXAd2PUbYW5Qh1Itx9Zl wubK1zH+mRyWMxVP+QBSrAmriiT2YaualeCS03qXfoOwmhxg/7dV/gS9TaRzRPg4PeHp bCiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175010; x=1706779810; h=mime-version: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=DDFxtdcLPkY0IFc3zdU3/GbsEBJAZQfzCSJ9dx0EWd9m11Q2Kqyj1kxC3kDj4RUHfg xR/UF+oQS/37p6OJF8/e1oJVERGNWxx6Fmmh8eF+HNYJBOX5d+bw9gDtPh+dmK9YUDlC GF/RjSv7QN1fD/xvUwfaZuVtywNKNiPrdw1NZJcpwwKGKja14/bgBXv0joj/tixbz1fm YPUGVDkbvFu0m/t3mY3JTvy9+MwHSF0tixAV4oGuPgU+42SzM8PQ185SJPjW9f4M76BO 7yD5PL9U2P6S/qq8SpFiG0pwb0w/I6ypyyZx6anVG2eeTKioNrbXRGFi2POkoVTnrdGx tIDQ== X-Gm-Message-State: AOJu0YxiERebk8Xkr4ql1VESRf2vW+aMkxRb1+Iux/vC50jbWG2x8LB+ to4jK9cHX+7aXtXN8PiwJiZqWXv+jbOHzvUARMxYJm6gkCDBS5BfgcGeM+vrLjY= X-Google-Smtp-Source: AGHT+IHR2JAcrhG8ExqyJsFCQa4Aypfl5nCwKpTCWXkGRjrpdvBOotJZQf6Ls117JWrB5pCF+YIQjw== X-Received: by 2002:a17:906:dd0:b0:a31:3a85:c5dc with SMTP id p16-20020a1709060dd000b00a313a85c5dcmr397187eji.51.1706175010036; Thu, 25 Jan 2024 01:30:10 -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 r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.09 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:09 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 15:09:47 +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");