From patchwork Mon Jan 22 20:21:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59376 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 2EFFC27BBEA; Thu, 25 Jan 2024 09:32:03 +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, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 51F5B27BBE2 for ; Thu, 25 Jan 2024 09:32:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4n-0008Q6-Fp; 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-0008Nv-AM 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 1rSw4W-00020k-95 for guix-patches@gnu.org; Thu, 25 Jan 2024 04:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSw4b-0007bu-W3; Thu, 25 Jan 2024 04:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. References: In-Reply-To: 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:01 +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.170617502129150 (code B ref 67260); Thu, 25 Jan 2024 09:31:01 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:21 +0000 Received: from localhost ([127.0.0.1]:47314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3w-0007Zy-Oj for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:21 -0500 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:58372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3u-0007ZN-EB for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:19 -0500 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-a315f43ecc3so71050266b.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175007; x=1706779807; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=op5+qAXkZvZoZO/tiwt0Qwd8FTa7QiK4YVFY9U0fXHg=; b=XAIFmQpn3YH76LVPjDq/zbWlXDLPt4PPeSpYYj2WQKSENr0tQyUYECUs+YETBA1+5p AmRpeEqT4VaM0bKn1mXSbj8Bg4NrJTr4mbZuKJuNqmmnU2Hf63vn6XlbNZhp9yZIvq8a gJkaRywdjw5leuSyshkDabDCaDIcQjzh9Z8/sgnnqj8ecJAbMQ3BPKrJPwcJKygtmcQ4 OzzUvOCjj0vpZKrYNkNsVn+Gvb3iOOsDCJrAFFyk7WGlkWOcymfomCjtYkW9ej+25+Ph k6sbW+YX7b3tJXT3SUAKTZFffLZFgm55AO5poaJ7f4X91wtw027DiWNUcfGHb9IJU5Vd 9G2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175007; x=1706779807; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=op5+qAXkZvZoZO/tiwt0Qwd8FTa7QiK4YVFY9U0fXHg=; b=dF2T6xbfQupU0CVg9/mRIqlGRNq2nlcoQiSOTZlwPq8dWhhw8ke+3tLeSfYN9RidhN ehdt/Q9e//yhPNNXA90io0ek7OrB6wU8lTcgE78NPesh8Z6hc+RcBEVy16deG/rItYXr 2D46BLuWMmUOpjiAQkVcFkPemC40juZF2hawhzTGR7m3H8CISiJaDiS7007B7D/iThYj wQmWzSbBDJlc2DWdHjx9D29bc++EMXYJ+vW6b4RXggkK+nTlvQqoRAtBN8I3pXkayd2S B6zcPuzUu1ZKhtjiS6w9xcI0/UwutNAabBoIkgMe69X6ux3g4AYcwjA1vpUQ5hWvQrPC MTzA== X-Gm-Message-State: AOJu0Yx2OS0ctCd707OS3nI02A6R42CK3DjOy3QPjpVdmg9hYSrb6nSP f9OilqY99a8vZUZei//jXbYgpCx+iZ/KovpzWDZLaIiCPKq8gOfdpWlOyMDMfI0= X-Google-Smtp-Source: AGHT+IHn3i7uLwXB3626T3slO2n1AIN45qXiLI3F8wvSS1XxZZw+8gH5mkeY2wFDP8DOq7vSPM/Eog== X-Received: by 2002:a17:907:d30a:b0:a31:7c6c:a997 with SMTP id vg10-20020a170907d30a00b00a317c6ca997mr241111ejc.98.1706175006604; Thu, 25 Jan 2024 01:30:06 -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.06 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:06 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Mon, 22 Jan 2024 21:21:26 +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/emacs.scm (emacs-minimal)[wrap-emacs-paths]: Also wrap EMACSNATIVELOADPATH. --- Am Montag, dem 22.01.2024 um 04:36 +0000 schrieb Suhail: > Suhail via Guix-patches via writes: > > > I don't believe this patch is sufficient.  It seems that the > > variable 'native-comp-eln-load-path may also need to be tweaked. > > The path to the "native-lisp" directory needs to be specified > > absolutely to make it not be dependent on the invocation-directory. > > Or it's possible that a patch that ensures that > 'native-comp-eln-load-path contains the absolute value of the > "native-lisp" directory obviates this one (6/6) in its entirety. This was the most cryptic hint towards the actual issue, but I've managed to resolve it anyhow. We still shouldn't enable jit compilation however; I've updated our reason as to why. gnu/packages/emacs.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5f27c551e0..2cdc9b8bca 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -273,7 +273,11 @@ (define-public emacs-minimal (let* ((out (assoc-ref outputs "out")) (lisp-dirs (find-files (string-append out "/share/emacs") "^lisp$" - #:directories? #t))) + #:directories? #t)) + (native-lisp-dirs (find-files + (string-append out "/lib/emacs") + "^native-lisp$" + #:directories? #t))) (for-each (lambda (prog) (wrap-program prog @@ -285,7 +289,11 @@ (define-public emacs-minimal (list (search-input-file inputs "/bin/gzip") ;; for coreutils (search-input-file inputs "/bin/yes")))) - `("EMACSLOADPATH" suffix ,lisp-dirs))) + `("EMACSLOADPATH" suffix ,lisp-dirs) + ;; Note: the interpretation order of EMACSNATIVELOADPATH + ;; is reversed, so 'prefix functions just like 'suffix + ;; for EMACSLOADPATH. + `("EMACSNATIVELOADPATH" prefix ,native-lisp-dirs))) (find-files (string-append out "/bin") ;; Matches versioned and unversioned emacs binaries. ;; We don't patch emacsclient, because it takes its From patchwork Sun Jan 21 12:12:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59373 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 7326427BBEA; Thu, 25 Jan 2024 09:31:38 +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 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 BEE3C27BBE9 for ; Thu, 25 Jan 2024 09:31:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4f-0008Ok-NX; Thu, 25 Jan 2024 04:31:06 -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-0008Nq-77 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 1rSw4W-00020l-L7 for guix-patches@gnu.org; Thu, 25 Jan 2024 04:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSw4c-0007c2-C9; Thu, 25 Jan 2024 04:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 2/7] gnu: emacs: Build trampolines. 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: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: 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.170617502229161 (code B ref 67260); Thu, 25 Jan 2024 09:31:02 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:22 +0000 Received: from localhost ([127.0.0.1]:47317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3x-0007a9-EO for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:22 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:58439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3v-0007ZR-21 for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:19 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55a90a0a1a1so5682022a12.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175007; x=1706779807; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=hPwsw6IgfEN5gUcpMNxh1WE8jwocUxKr68x6nIbOMOezLuAPdftCTankoaLSV65pXT gV2hffWtQWvWV20JX9oopFo5mpnLx2dpODqtxRZ8HDpEFYmvMx7cuBGOicRkqymMbCA5 KtffGWbL3+tUYtqZFyoltOcSJarSkfKkkZLhY6v5b4xHEVOzS3nwbLieF7bYnaedP1Ss NJV/OCTBY8a3BEaL5DcGulkJdT3pbcmOBvGk7jZcWSh/unJQBrWFhE0+7i1KeC6w1c5V cfxKODsPTkfyhw7bt/gUe9KK8Wp3SqZTPclr6SdG9yj2336I1mt8kBOj8SPya/DfY0rs 5VrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175007; x=1706779807; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=GQGDT0cQODQATAe1+q+A+6Gn9DMfuCnPRNkBkuKPC2iWQZaX+rFPwyhO7VlgvInKEO dJkD+nt18ns/JO0duCtNquCAV0wo/Z1GqzzMQj1KzXzDz/5GqvQgjkznHwRNVuoeQGBH f8mtqbLCBokEYbhi+OtUfEeT6iL/33pF66RNlGnVlnxyaufxJRH3wXm9DPcukCiC0Kpn 9WXk87ZA81qCtejXDbhn14kWfKcXuaGyIvBk4jZ20JuAmVbGxpAXJVB+f35Nd03t2ibC V9arV/6j4IzSyFwHFmXgnAGrZamI7kkCKJ0zgEQGxbT3xk+C8f9uQc/BbHpohGIbArZj gEwA== X-Gm-Message-State: AOJu0YyJvl/r0xGoQTKlxRdW4ewwuBzBqaoO9Z8f1NqobqBnS0J/Adw1 mKjFHv+7C0Mfh0sz830BOjwg4xODwyAMzB36g+ACc96KJ1LJ8odE9Q568CxCrAw= X-Google-Smtp-Source: AGHT+IF+5jnF7xTR2t/hiTwJzvWwqNGuhKDv/kFQHHJ6LnwXy5JhfeOOjUaZijrIADln1jWsEwDEtA== X-Received: by 2002:a17:906:2ad5:b0:a31:82d3:75be with SMTP id m21-20020a1709062ad500b00a3182d375bemr126688eje.66.1706175007186; Thu, 25 Jan 2024 01:30:07 -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.06 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:06 -0800 (PST) Message-ID: <75fc54d6051c02ab2edc333de71ee4689a287ed0.1705957032.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:41 +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/emacs.scm (emacs-no-x)[#:phases]: Add ‘build-trampolines’. Change-Id: I33303bcbaf6cbda15867a5546e793c05d1f0e67b --- gnu/packages/emacs.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2cdc9b8bca..0292b1bd16 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -384,7 +384,10 @@ (define-public emacs-no-x (string-append "-B" #$(this-package-input "libgccjit") "/lib/") (string-append - "-B" #$(this-package-input "libgccjit") "/lib/gcc/")))))))))) + "-B" #$(this-package-input "libgccjit") "/lib/gcc/")))))) + (add-after 'build 'build-trampolines + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "trampolines" make-flags))))))) (inputs (modify-inputs (package-inputs emacs-minimal) (prepend gnutls From patchwork Sun Jan 21 12:12:42 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: 59377 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 6149927BBEA; Thu, 25 Jan 2024 09:32: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=-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 C296627BBE2 for ; Thu, 25 Jan 2024 09:32:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4n-0008Q7-He; 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-0008Nu-AG 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-000213-5U for guix-patches@gnu.org; Thu, 25 Jan 2024 04:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSw4d-0007cK-5J; Thu, 25 Jan 2024 04:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 3/7] gnu: emacs: Don't hash file names in native 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: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: 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.170617503029196 (code B ref 67260); Thu, 25 Jan 2024 09:31:03 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:30 +0000 Received: from localhost ([127.0.0.1]:47322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw45-0007al-Cq for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:30 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:42011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3v-0007ZS-HW for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:20 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a313b51cf1fso95440866b.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175008; x=1706779808; 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=JvOmNPdravM11kPQ2ReMhGHECZagEoaWBIOUqN61/Y4=; b=imEFJKPoojJBdRdJT1wogMkUydOSdmUMW23cKDx3m6JTGFTRY6KRHZ0KvVQ1bwt3Ea XsOwdB/g5YzTfChYppTIYPmZh4X76zT5U2VTn7s7YyBwbxxdmffZbebTf5UFV/3AegZz 2/v29G01n/ffdp6cXHJjwdlrNNud244fAXVkEKWLG9k6v2tATEd4idKmjs0O2xzMINLx nx9X4/zUbrZNl54+VZnApIdoDgYi5lnhIRYycqd2LfWE+kW44d5WWuR1/sEUoMnZkgtV 2hI+5f/XKp1nYEyNdG9bWhUkPLbtTRwxXWGEeozN+sroyOk+h9y62buAnkjzYGTz5ehZ e80Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175008; x=1706779808; 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=JvOmNPdravM11kPQ2ReMhGHECZagEoaWBIOUqN61/Y4=; b=E9oZZoexWa49V3n+CSUM8x+XglpT7ZrfdMvm+vlqu0pXqrfZRTpHyxbOzbCvj7wsiG 6flGiVaICsI2RZypYD0AD2eX8qxt2t0QytLPHumgUdCTiX+Uj4Ia4Xoj8VlIPwchspou 3jKkd4e42mzkVF/7Vl8ttEqAVKETs0Wgo68OCKS68O2gk9Kt36gzcW8POItD4B4wXRZH moHrNSp+wj76LovfrqLX8LrpJlctCVMrlNvIYUJG76ITEz/7RyiRR79ZscEMQMizYZW6 n+vSzglUqYiEyXfc3koxjRGJW+wCks9RwdvTHSK+mnOrOIW/3IxfGBddxwWfirgvD+uC KIGg== X-Gm-Message-State: AOJu0YycHx1hLeegMfOqlMbDihrSxsREhsqIyU41aljTzarQzGblqFJh 4cUgOrdvQTV9OGNb2CbRzF9S/ECpSUr68OLoT/MEM3gMz5O5IGQdih5o20dbF8k= X-Google-Smtp-Source: AGHT+IFXAkb22k7LG8P8Dvjw04d8xtgScCdTAWCptpIHkrD7IlQAHRb0WllB4fzgTUQURXAi9x7xUg== X-Received: by 2002:a17:906:1594:b0:a30:428c:b1b8 with SMTP id k20-20020a170906159400b00a30428cb1b8mr722193ejd.42.1706175007750; Thu, 25 Jan 2024 01:30:07 -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.07 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:07 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +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-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 197 ++++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d1afd4555..7e6a0c5006 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1121,6 +1121,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0292b1bd16..1caa2cbee0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -111,6 +111,7 @@ (define-public emacs-minimal (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" + "emacs-native-comp-fix-filenames.patch" "emacs-pgtk-super-key-fix.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch new file mode 100644 index 0000000000..714b707e47 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,197 @@ +Upstream hashes both the absolute file name and the content of a file +to derive the name for the natively compiled files. This breaks the +staged install used in guix, as any $GUIX_PROFILE is distinct from +the build directory. It also breaks grafts, as hardcoded store file +names get rewritten; thus changing the file hash. + +Index: emacs-29.1/src/comp.c +=================================================================== +--- emacs-29.1.orig/src/comp.c ++++ emacs-29.1/src/comp.c +@@ -4396,26 +4396,18 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc + 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. +-If FILENAME is compressed, it must have the \".gz\" extension, +-and Emacs must have been compiled with zlib; the file will be +-uncompressed on the fly to hash its contents. +-Value includes the original base name, followed by 2 hash values, +-one for the file name and another for its contents, followed by .eln. */) ++FILENAME is resolved relative to `load-path' and only the suffix of ++the first matching path is kept. If FILENAME is not found to be relative ++to any directory `load-path', it is used as-is to construct the return ++value. Further, if the NATIVE_COMP_BOGUS_DIRS environment variable is set, ++the first matching prefix mentioned in it will be stripped as well. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); + +- /* Resolve possible symlinks in FILENAME, so that path_hash below +- always compares equal. (Bug#44701). */ +- filename = Fexpand_file_name (filename, Qnil); +- char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL); +- if (file_normalized) +- { +- filename = DECODE_FILE (make_unibyte_string (file_normalized, +- strlen (file_normalized))); +- xfree (file_normalized); +- } ++ Lisp_Object rel_name = filename; + ++ filename = Fexpand_file_name (filename, Qnil); + if (NILP (Ffile_exists_p (filename))) + xsignal1 (Qfile_missing, filename); + +@@ -4423,64 +4415,53 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); +- +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); +- +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation +- +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ +- +- if (NILP (loadsearch_re_list)) ++ FOR_EACH_TAIL_SAFE (tail) + { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } +- +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) + { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); + break; + } + } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; ++ ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); ++ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } ++ } ++ ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4475,7 @@ If BASE-DIR is non-nil, use it as the di + 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 +-whose name is given by `comp-native-version-dir'. +-If FILENAME specifies a preloaded file, the directory for the .eln +-file is the \"preloaded/\" subdirectory of the directory determined +-as described above. FILENAME is considered to be a preloaded file if +-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME +-appears in the value of the environment variable LISP_PRELOADED; +-the latter is supposed to be used by the Emacs build procedure. */) ++whose name is given by `comp-native-version-dir'. */) + (Lisp_Object filename, Lisp_Object base_dir) + { + Lisp_Object source_filename = filename; +@@ -4541,19 +4516,7 @@ the latter is supposed to be used by the + + if (!file_name_absolute_p (SSDATA (base_dir))) + base_dir = Fexpand_file_name (base_dir, Vinvocation_directory); +- +- /* In case the file being compiled is found in 'LISP_PRELOADED' or +- `comp-file-preloaded-p' is non-nil target for output the +- 'preloaded' subfolder. */ +- Lisp_Object lisp_preloaded = +- Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); +- if (comp_file_preloaded_p +- || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), +- CALL1I (split-string, lisp_preloaded)))))) +- base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + + return Fexpand_file_name (filename, base_dir); + } +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/src/Makefile.in +@@ -553,6 +553,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. From patchwork Sun Jan 21 12:12:42 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: 59374 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 E36BB27BBE9; Thu, 25 Jan 2024 09:31:50 +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 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 D353027BBE2 for ; Thu, 25 Jan 2024 09:31:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4n-0008Pd-6h; 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-0008Ns-8Z 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 1rSw4X-00020p-1f for guix-patches@gnu.org; Thu, 25 Jan 2024 04:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSw4c-0007cB-NM; Thu, 25 Jan 2024 04:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 4/7] build-system: emacs: Compute relative file names. 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: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: 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.170617502929185 (code B ref 67260); Thu, 25 Jan 2024 09:31:02 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:29 +0000 Received: from localhost ([127.0.0.1]:47320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw45-0007af-2f for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:29 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:51266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3v-0007ZU-Sp for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:20 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a271a28aeb4so697742266b.2 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175008; x=1706779808; 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=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=jRrFZD+oBGw4udYnzZZPBa9oyN1WDFPd/834RCsbwJoNonxXawW/dPE1eTh8bQQDrS BLuftU2ovJVhZHFigBJk7vmf3Rm74EV6UhxvTtkbpgeedgdkAfynRx4aGzEdzHzdABLv EV7ISe7aVPW3Q047J+g4DJJzmh0J0MJ6U+Vkeq0iyUblSLZVBhjKfnNMLKfVP2Ir0/WF A+Lhq+H1Fz/wPASbc7WdCqgFWcxku/FCPMU3bCBpC+O55xncbJ/9/VGZXkxUiMdijU8w wSgZWcqljNf7YKge35mJEsiDHZaF4hUpBbuhm9fr422HLMvivKDIVTkruHU0BwKmfALz +2Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175008; x=1706779808; 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=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=KQVTLKu+daziWiMEVsnoLLdasVCvr9TIGtu/TPpk/Qe5HggEDXdcgjIrswIaVbP8Vl TaWNLnnqmVzFz1LMxHw6BAck86R72XMtiYthsM92NuamQeE79RM5kYXw6P5aGct6NWuz 8TkonWq8s8gkzQZPO4d0w2zIr4E2T+Z12DUktP47vGIfUqi45bnGGvXD8sKi0RmTEtBY cA/Wwuzkk8xCg5G3aHfuQi9mFtGNs06H6rjkApBzuIBBak6DAZ2Xz7jJAAOsgEmfe2rz ITV8T3tXALFeHopqW96RYUTF3KSns8IYR5UkpPnxYk/imPR/4eDiKByYa6fMV7z3Y5Gd F6CA== X-Gm-Message-State: AOJu0YxUMV6jEzGDGi4eGa6yXnz8hWXbWRlwmLT7g+L14IPTWti9YvsM iRL6JOQcOZWBxzA1FyYZ+natktNdYJk1nS6S6ZhNEaICybovGIqQEEkCz1QBpr8= X-Google-Smtp-Source: AGHT+IE1P3M0juWJc3J3VGBfMu5gRjQNrASbQfFkj8/3tqjJHw9JCyaBD8vfDuyHf3zuAzU2TKUKeg== X-Received: by 2002:a17:906:707:b0:a31:7bb2:96c4 with SMTP id y7-20020a170906070700b00a317bb296c4mr327978ejb.150.1706175008303; Thu, 25 Jan 2024 01:30:08 -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.07 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:08 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +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 With the previous commit, relative file names are expanded relative to ELN_DIR -- more or less. To make use of this in emacs-build-system, we must also pass relative file names. * guix/build/emacs-build-system.scm (emacs-compile-directory): Compute the relative file names of the files to compile. Change-Id: I8983f80fb0fe1573e46748222403ba8873f1599f --- guix/build/emacs-utils.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 8e12b5b6d4..eca42bf305 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -146,7 +146,9 @@ (define* (emacs-compile-directory dir) (cadr native-comp-eln-load-path)))) (if byte+native-compile (native-compile file - (comp-el-to-eln-filename file eln-dir)) + (comp-el-to-eln-filename + (file-relative-name file ,dir) + eln-dir)) (byte-compile-file file)) ;; After native compilation, write the bytecode file. (unless (null byte-to-native-output-buffer-file) From patchwork Sun Jan 21 12:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59372 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 0CCD427BBE9; Thu, 25 Jan 2024 09:31:29 +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 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 4653E27BBE2 for ; Thu, 25 Jan 2024 09:31:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4q-0008SQ-FD; Thu, 25 Jan 2024 04:31:16 -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-0008Nr-8L 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-000212-00 for guix-patches@gnu.org; Thu, 25 Jan 2024 04:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSw4d-0007cT-Hk; Thu, 25 Jan 2024 04:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 5/7] gnu: emacs-org: Fix native builds. 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: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: 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.170617503029203 (code B ref 67260); Thu, 25 Jan 2024 09:31:03 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:30 +0000 Received: from localhost ([127.0.0.1]:47324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw46-0007ar-7g for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:30 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:55664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3w-0007ZV-DL for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:20 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a31914e7493so26565966b.3 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175009; x=1706779809; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=XLj3n+n7QRS4cvuVOPEq6VDQwoWluGnFeeukD2CXUb6qGXiHeFru35An5zxvWkWD3u XYWvY/7cik0R6T6pLjw8+lK/ofutE6LGqkdtMG8V6u46oZFVDNd9Jf3mRv7oWpf9uiJU SgN+C9JshDS9NQMNilGJgKF2VUqM1ZR4eE/UCfLc9Fd6ABpt27dy3cYdVGqGbvGoozH+ qiaKDKDWpivRNe6rGmIpppszPsxbFIc0ZPcKuid4Y903YSvJsHXGFIHwYdPP18+0yzpv sBvrf4YgtqmiUq6oFPGndmUYJsfTCIHKIgGOmUGjLWPSifsI7J848MRgorO4b9VrnU+k yUyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175009; x=1706779809; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=CHthuzIjPtIsKhffqZSLD9zj7oKINldslxC9rRliXzgfv1P9qknb0vAESkKdq5q7E6 IqlEes+dqbwjlAU1mtazEv4c6BZpP4BZCsJRnZXTdsNIT9I+lOTKeHjwG04fZ4oZoq0d /Enx6GtHh6n5aw6rKNMIHeeLkqA1p/6AO0QNSywi+ksCrzDeQktUR9uF19wZfBKr4rf0 sL6dkJoo8iI2VGIqGhfIeaoLL1LRk27l6QIamtkkKiYpdSzE6UOZ5hZIyJ6jvS5iiNPU Fsl3ISL8P3kI3DgBI7zT7J2yvkIUaBGP+QfnZmLfDIWnA8CBOHrpKUpQzM/UYaFT6xAy RFpg== X-Gm-Message-State: AOJu0YzYdYsd25aLnhuvXRd1Xt6qwr2pLrNemiHN5+2AIQz9RgI/8rvI jwxWOkw3Xz+e+qJBn6vhjThy7NCdUsO8ZNaNMCZFRMk9c/cuw7at0tW3CYZOYHU= X-Google-Smtp-Source: AGHT+IH+FxGOyWlVXpz3T0Up1K2/6J4cYiUxGd+dLbUIdDb56WUYCT9jP8SPTZTqSTgYO7L8oq2hGQ== X-Received: by 2002:a17:907:a08e:b0:a31:1ded:f129 with SMTP id hu14-20020a170907a08e00b00a311dedf129mr397478ejc.14.1706175008953; Thu, 25 Jan 2024 01:30:08 -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.08 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:08 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +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/emacs-xyz.scm (emacs-org)[#:phases]: Wrap ‘build’ in a directory excursion to the actual lisp directory. Change-Id: Ifa10f9e91fe21cd4c34da11b68ddb77a03d847ca --- gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fc3c9e00be..e2aebe971e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16752,6 +16752,10 @@ (define-public emacs-org (substitute* "testing/lisp/test-org.el" (("test-org/org-(encode-time|time-string-to-time) .*" all) (string-append all " (skip-unless nil)\n"))))) + (replace 'build + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'build) args)))) (replace 'install (lambda _ (let ((elpa (elpa-directory #$output)) From patchwork Sun Jan 21 12:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59371 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 82ACD27BBE9; Thu, 25 Jan 2024 09:31:10 +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 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 3E04527BBE2 for ; Thu, 25 Jan 2024 09:31:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4e-0008Oj-RK; Thu, 25 Jan 2024 04:31:05 -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-0008Np-6p 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-000216-9v for guix-patches@gnu.org; Thu, 25 Jan 2024 04:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSw4e-0007cd-07; Thu, 25 Jan 2024 04:31:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 6/7] gnu: emacs-magit: Fix native builds. 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: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: 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.170617503129210 (code B ref 67260); Thu, 25 Jan 2024 09:31:03 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:31 +0000 Received: from localhost ([127.0.0.1]:47326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw46-0007ay-Il for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:30 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:54282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3w-0007ZX-U1 for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:21 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a30359b97a8so466450266b.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=1706175009; x=1706779809; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=EUnPexo4k563WmQZwyvR8HYUVItYOCko+W6NZPX3SpJFArOrueOvUmMxZp9Rz5taMm I25mzQuANhHs/dluRQRh3h9dW1lunF9PwO35vwlJCAtTPtOMrpQuI+K+U1MpBSZ9ineJ kWtY0J/bH2NdjtK2aTaH6I0QVyT8zBb4oQKxJWfHJ1YkMr5LdrnhhPm8OxBpRrDgCv5c Y/pLot0PjSta4C3zctlkdeSGb1RAsdXJnhJDDCSSBj8VNBwW8bjhWrC0fz8SgQ2PCsgl HF3MucyiS7rMVFeiXYVUemFwl1z2hITpX8NfMW1Uv3M/qq9cBYwfQCIAffSzx5HYUZOB bTYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175009; x=1706779809; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=pswm/f8q9pFOU/q3VIFUETt45bDYNaxnN0sRgIIsHafjZTZJoMl4dFSEiafT/GAhp+ vU1u5+TaqAhkWQvBBbzEukEJ8npK5RcAu+UjZCLSnlxqv4bK9ngNrKgzZgHKJlGqrl4c +ERVSBgsQS13ZXIlCT/H26jMDP1y0FVYnR9RMT7uoJFgSjvVGo4KeIIOiNqHQx9F4xIj Wy67ME29kgcL2ag3OFHoWefH13Kcp1CYen01t0dg52z/lg1zRsIX/ul8KZwKkuI3LUCU uAKo1MkhCzzOtoNYTgyjv6aDTlOe+6xmqgbCB/2vaccg39PpfEB6rtBRYpjWhaoGmScu /wHg== X-Gm-Message-State: AOJu0YwyFlsktoav3seFWQFuwXFm8RKeO/tkWlS13J9JdVu2IESVc+Ye 0yHolScT+lrGUSKdAW3vUV5r5ZprJydOVrtDr5u99Bq8chyp131TAODrUieoa2U= X-Google-Smtp-Source: AGHT+IHhn0jSohm9hCgfPQcjuPw/2tdQJ9OLkvFfcW8wCtcVJjx668YVM0QFJjAnzJBL3iBzNTMymA== X-Received: by 2002:a17:907:2955:b0:a28:7dd0:adb4 with SMTP id et21-20020a170907295500b00a287dd0adb4mr261761ejc.83.1706175009489; Thu, 25 Jan 2024 01:30:09 -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 13:12:42 +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/emacs-xyz.scm (emacs-magit)[#:phases]: Also wrap ‘build’ in a directory excursion. Change-Id: I332325989a1bbaa95552c2cbf50f336f0075c1c4 --- gnu/packages/emacs-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e2aebe971e..a0ac8f5a57 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1590,7 +1590,11 @@ (define-public emacs-magit (replace 'install (lambda args (with-directory-excursion "lisp" - (apply (assoc-ref %standard-phases 'install) args))))))) + (apply (assoc-ref %standard-phases 'install) args)))) + (replace 'build + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'build) args))))))) (native-inputs (list texinfo)) (inputs 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");