From: Liliana Marie Prikler <liliana.prikler@gmail.com> To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail <suhail@bayesians.ca>, andrew@trop.in Subject: [bug#67260] [PATCH v7 4/7] gnu: emacs: Disable jit compilation. Date: Tue, 13 Feb 2024 19:30:50 +0100 [thread overview] Message-ID: <2188ddbfcdabbba12df18a4c3af34b123ea8448d.1707852049.git.liliana.prikler@gmail.com> (raw) In-Reply-To: <f338ca94952ca0c16fce803022dd6a6c1dc6e13e.1707852049.git.liliana.prikler@gmail.com> * 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"); -- 2.41.0
WARNING: multiple messages have this Message-ID (diff)
From: Liliana Marie Prikler <liliana.prikler@gmail.com> To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail <suhail@bayesians.ca>, andrew@trop.in Subject: [bug#67260] [PATCH v9 4/7] gnu: emacs: Disable jit compilation. Date: Tue, 13 Feb 2024 19:30:50 +0100 [thread overview] Message-ID: <2188ddbfcdabbba12df18a4c3af34b123ea8448d.1707852049.git.liliana.prikler@gmail.com> (raw) Message-ID: <20240213183050.4dCyVvCu19a1CARd7J5JkdYm9GmAxUtTZ_8rMhrDAWw@z> (raw) In-Reply-To: <f338ca94952ca0c16fce803022dd6a6c1dc6e13e.1707852049.git.liliana.prikler@gmail.com> * 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"); -- 2.41.0
next prev parent reply other threads:[~2024-02-13 19:32 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-18 13:42 [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling Liliana Marie Prikler 2023-11-18 13:38 ` [bug#67260] [PATCH emacs-team 2/2] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2023-11-18 15:44 ` [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling Andrew Tropin 2023-11-18 15:51 ` Liliana Marie Prikler 2023-11-22 12:09 ` Mekeor Melire 2023-11-22 17:39 ` Liliana Marie Prikler 2023-11-25 11:13 ` [bug#67260] [PATCH emacs-team v3 1/3] gnu: emacs: Build trampolines Liliana Marie Prikler 2023-11-25 11:13 ` [bug#67260] [PATCH emacs-team v3 2/3] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2023-11-25 11:13 ` [bug#67260] [PATCH emacs-team v3 3/3] build-system: emacs: Compute relative file names Liliana Marie Prikler 2024-01-18 5:55 ` [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling Suhail via Guix-patches via 2024-01-21 12:12 ` [bug#67260] [PATCH v5 1/6] gnu: emacs: Build trampolines Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v5 5/6] gnu: emacs-magit: Fix native builds Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v5 4/6] gnu: emacs-org: " Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v5 2/6] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v5 3/6] build-system: emacs: Compute relative file names Liliana Marie Prikler 2024-01-21 14:09 ` [bug#67260] [PATCH v5 6/6] gnu: emacs: Disable jit compilation Liliana Marie Prikler 2024-01-22 4:16 ` Suhail via Guix-patches via 2024-01-22 4:36 ` Suhail via Guix-patches via 2024-01-22 20:21 ` [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v6 2/7] gnu: emacs: Build trampolines Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v6 4/7] build-system: emacs: Compute relative file names Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v6 3/7] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v6 6/7] gnu: emacs-magit: Fix native builds Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v6 5/7] gnu: emacs-org: " Liliana Marie Prikler 2024-01-21 14:09 ` [bug#67260] [PATCH v6 7/7] gnu: emacs: Disable jit compilation Liliana Marie Prikler 2024-01-22 20:21 ` [bug#67260] [PATCH v7 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v7 2/7] gnu: emacs: Build trampolines Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v7 6/7] gnu: emacs-org: Fix native builds Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v7 3/7] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v7 7/7] gnu: emacs-magit: Fix native builds Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v7 5/7] build-system: emacs: Compute relative file names Liliana Marie Prikler 2024-01-21 14:09 ` [bug#67260] [PATCH v7 4/7] gnu: emacs: Disable jit compilation Liliana Marie Prikler 2024-01-22 20:21 ` [bug#67260] [PATCH v8 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v8 2/7] gnu: emacs: Build trampolines Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v8 7/7] gnu: emacs-magit: Fix native builds Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v8 6/7] gnu: emacs-org: " Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v8 3/7] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2024-01-21 12:12 ` [bug#67260] [PATCH v8 5/7] build-system: emacs: Compute relative file names Liliana Marie Prikler 2024-01-21 14:09 ` [bug#67260] [PATCH v8 4/7] gnu: emacs: Disable jit compilation Liliana Marie Prikler 2024-01-25 23:53 ` [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH Suhail via Guix-patches via 2024-01-26 7:49 ` Suhail via Guix-patches via 2024-01-26 8:20 ` Suhail via Guix-patches via 2024-01-26 22:45 ` Suhail via Guix-patches via 2024-01-27 15:36 ` Suhail via Guix-patches via 2024-01-27 16:24 ` Suhail via Guix-patches via 2024-01-27 17:15 ` Suhail via Guix-patches via 2024-01-27 19:39 ` Suhail via Guix-patches via 2024-01-28 0:13 ` Suhail via Guix-patches via 2024-01-28 0:18 ` Suhail via Guix-patches via 2024-01-28 16:17 ` Suhail via Guix-patches via 2024-02-13 18:30 ` [bug#67260] [PATCH v7 " Liliana Marie Prikler 2024-02-13 18:30 ` Liliana Marie Prikler [this message] 2024-02-13 18:30 ` [bug#67260] [PATCH v9 4/7] gnu: emacs: Disable jit compilation Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v7 2/7] gnu: emacs: Build trampolines Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v9 " Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v9 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v7 3/7] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v9 " Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v7 6/7] gnu: emacs-org: Fix native builds Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v9 " Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v7 5/7] build-system: emacs: Compute relative file names Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v9 " Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v7 7/7] gnu: emacs-magit: Fix native builds Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH v9 " Liliana Marie Prikler 2024-02-14 0:56 ` [bug#67260] [PATCH emacs-team v9*] Think ahead when compiling Suhail via Guix-patches via 2024-02-14 8:41 ` [bug#67260] [PATCH emacs-team v9*] Test for AOT native-comp Suhail via Guix-patches via 2024-02-16 15:09 ` [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v10 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v10 2/7] gnu: emacs: Build trampolines Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v10 6/7] gnu: emacs-org: Fix native builds Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v10 5/7] build-system: emacs: Compute relative file names Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v10 7/7] gnu: emacs-magit: Fix native builds Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v10 3/7] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v10 4/7] gnu: emacs: Disable jit compilation Liliana Marie Prikler 2024-02-17 14:49 ` [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things Suhail via Guix-patches via 2024-02-17 15:15 ` Liliana Marie Prikler 2024-02-18 0:56 ` Suhail via Guix-patches via 2024-02-18 9:19 ` Liliana Marie Prikler 2024-02-19 21:42 ` Suhail via Guix-patches via 2024-02-20 17:51 ` Liliana Marie Prikler 2024-02-20 18:41 ` Suhail via Guix-patches via 2024-02-24 8:04 ` [bug#67260] [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v11 4/7] gnu: emacs: Disable jit compilation Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v11 5/7] build-system: emacs: Compute relative file names Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v11 2/7] gnu: emacs: Don't hash file names in native compilation Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v11 6/7] gnu: emacs-org: Fix native builds Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v11 7/7] gnu: emacs-magit: " Liliana Marie Prikler 2024-02-13 18:30 ` [bug#67260] [PATCH emacs-team v11 1/7] gnu: emacs: Build trampolines Liliana Marie Prikler 2024-02-24 6:18 ` [bug#67260] [PATCH emacs-team v11 3/7] gnu: emacs: Check integrity of native-compiled files Liliana Marie Prikler 2024-03-04 7:13 ` [bug#67260] [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! Andrew Tropin via Guix-patches via 2024-03-04 19:59 ` Liliana Marie Prikler 2024-03-01 17:35 ` Suhail via Guix-patches via 2024-03-01 19:40 ` bug#67260: " Liliana Marie Prikler 2024-03-07 8:55 ` [bug#67260] " Andrew Tropin via Guix-patches via 2024-03-07 17:52 ` Liliana Marie Prikler 2024-03-08 9:20 ` Andrew Tropin via Guix-patches via
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://guix.gnu.org/ * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2188ddbfcdabbba12df18a4c3af34b123ea8448d.1707852049.git.liliana.prikler@gmail.com \ --to=liliana.prikler@gmail.com \ --cc=67260@debbugs.gnu.org \ --cc=andrew@trop.in \ --cc=cox.katherine.e+guix@gmail.com \ --cc=suhail@bayesians.ca \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).