From patchwork Mon Jan 22 20:21:26 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: 59454 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 E0E1627BBE2; Sat, 27 Jan 2024 07:05:18 +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 E89D527BBE9 for ; Sat, 27 Jan 2024 07:05:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckL-00024Y-3M; Sat, 27 Jan 2024 02:04:57 -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 1rTckJ-00022X-Ig for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:55 -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 1rTckJ-0004yI-Al for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckQ-0002YK-6C for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 07:05: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.17063390619683 (code B ref 67260); Sat, 27 Jan 2024 07:05:02 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:21 +0000 Received: from localhost ([127.0.0.1]:53329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002W5-JJ for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:20 -0500 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:55297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcji-0002Vf-MJ for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:19 -0500 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-5102e2ab56eso295799e87.2 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339046; x=1706943846; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=SWvRJBgRnNr3LQLoUq1Xn3YgJvO0XhnKjND/itlKcgKOGZu8Rxt9fAv0kx8LyA9mol SRzIO3wJahc3VkeuCyNykIMr7QFBHPuH6iCcsdBXF7OfK3YyOlZrl+FZDKhAc84JY8zN Cwcz9Owv6x6xRvnMl+rRoRWoA1CKx3CSzcyvnIq9iid/sm94cdT4tHMr+GR/cl3kukZw I+p+kkKvFOiZY30izW34bmo2JAueQIqeVfSKZC+JLw2Vculu8baDaJvrGK7eCScd7HYN ZkpIwZaxGo+jE/0LrYKOMQw7p/RHfI+QWHXjtQ8QV7TWzmYxp+QVaScRRsRqRVGjTw85 I31A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339046; x=1706943846; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=bF6COgba9FiUINq5zFMbnfbjsx1Jltegig5BqCVUzPCfG7XbhKCMRSRl9dYlAyhuF+ +JHtIMZocm3jcfAGVQkpo8O5KEZSxjn1H5rkDo8mWc/eIjxiKH5QO5o6hFYna/zKPJBR Dwwl5dyKJoDOUdaehIT+/Pwf2Q5vAJfOVm+yw3WTbtD7PwPwmU4CHMfqc0OVBMroW2Li l+TuX/3eE1Ct0VO5EfzWaAMNAyZ/PynmE5dlx4zzG2xbo2sD1rBWl6akgoa7Ha/2A7cZ 2xOhzIK330Am78aJRCoDOKL/sSFGGy7hZpmkto3Sh/k6z0oLIwNcYiG3yGS3n4CawAGI /pBw== X-Gm-Message-State: AOJu0YxXr3pHXR8w5TsPR+ZIY3XPsNXYII7bxKKDngduBDv5kkn7v/IO I1fF3HtxNvj0mNVcBuPHTdGTx14MOC0jq78g0+YhuO0+d0r4FinR9hqs2iYR X-Google-Smtp-Source: AGHT+IHuABlkleAdsqtzfvqjhcfdMJSsQXSQ88IOc2dEGC+d9JlWSrNKfPtzL1zng0Gyg+/pshUCPw== X-Received: by 2002:ac2:546f:0:b0:50e:2c05:5773 with SMTP id e15-20020ac2546f000000b0050e2c055773mr514355lfn.27.1706339045482; Fri, 26 Jan 2024 23:04:05 -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 tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:05 -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. --- 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: 59456 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 C8A9527BBE2; Sat, 27 Jan 2024 07:05:23 +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 C292127BBE9 for ; Sat, 27 Jan 2024 07:05:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckL-00024q-Ae; Sat, 27 Jan 2024 02:04:57 -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 1rTckK-00024F-4h for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:56 -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 1rTckJ-0004z2-S1 for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckQ-0002YR-Mr for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 2/7] gnu: emacs: Build trampolines. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 07:05: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.17063390629697 (code B ref 67260); Sat, 27 Jan 2024 07:05:02 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:22 +0000 Received: from localhost ([127.0.0.1]:53332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002WA-VP for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:21 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:50466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjj-0002Vg-8C for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:19 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a28a6cef709so104689966b.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339046; x=1706943846; darn=debbugs.gnu.org; h=cc: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=f71EHqCsPHTuBPBjV8KqQmr4ph820bUgFERw5uItS4mTTNetQ5gJXG7Ku5Xm0iuS5Z dgPM7kBB+puTSmRUBngK8tr0vuNR129JTEm97OAiDQucBbC1D5PZNC1D5Hp/Lkh8Aguo d682hpeTYt0iQBCveamVtsslSgflWEkjkR3N3PYwRcFbl8JjElfNlSK2iRnGWsfKXzsh 9yP962CGoA4GeJvuYve0ssfcJD4+FtlLCKh0tYQzy+j1cxoPM6ZQbWGCS48swtMHx/nt vUCXEc93VQyOYBse3y5NvgOOQjS0mXHX4bPpXLwq5RFrJScbpQEq6RVlsFJIj50NTAo3 A/AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339046; x=1706943846; h=cc: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=daZOF4nxKQyhU8I7yW2j4nYwn4IHsbd9AjQVXYx5m4r+Iu2pNMtaFhg1muWWP+gRUD ewkcKrJMJ5wyVkzZgsOqXHwMqIHNoaczoVkoIdG7lgW/7yLvEZ6sTdzv1+lmORHg0DBB PtztUc/rrUCEskSx+VM3kU26j7Tyj9RAe1/vE00HVWuBFeWnTIOMzJgRFB+vR4gnJrLC 42OMwps3TMDuHxuwwNht1sTmN8XMlMTcjuHFlWIrBP1EsQzljIZaQ+PfGmXjbz2jFftH /pLi3Jusl0FrTlmul1SwU7/KuDdqjI6uX8+QS5yrLKMr3Lm4ESNw1jdigob7QSG+/jDl 56Nw== X-Gm-Message-State: AOJu0YzhQj+nyiroyII2HW8tn+xF+xE++V7I7gPuNV72WlWdcVS+b7W5 AUUwFws8VHABGZdYBu5+yrfpkcntPvP+Sxk+rWBdVyqi+3baFE6rtm6SOZ3nBSo= X-Google-Smtp-Source: AGHT+IGvwhGKnxiRPliBvpv+Lnwro06ilNXr+n8OIYAfhLJMdGHV8TqFjQuHxWexPULtSvekCIxWCA== X-Received: by 2002:a17:906:470a:b0:a34:e324:c8d5 with SMTP id y10-20020a170906470a00b00a34e324c8d5mr548161ejq.33.1706339046403; Fri, 26 Jan 2024 23:04: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 tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:06 -0800 (PST) Message-ID: <75fc54d6051c02ab2edc333de71ee4689a287ed0.1706339016.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: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59458 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 5C7D527BBE9; Sat, 27 Jan 2024 07:05: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=-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,URIBL_BLOCKED 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 64DAD27BBE2 for ; Sat, 27 Jan 2024 07:05:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckN-00025r-0g; Sat, 27 Jan 2024 02:04:59 -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 1rTckL-000258-JY for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:57 -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 1rTckL-000506-B4 for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckS-0002Yp-81 for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 3/7] gnu: emacs: Don't hash file names in native compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 07:05: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: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.17063390729754 (code B ref 67260); Sat, 27 Jan 2024 07:05:04 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:32 +0000 Received: from localhost ([127.0.0.1]:53341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjv-0002X9-P6 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:32 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:50478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002Vi-64 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:22 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55a5e7fa471so818315a12.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339047; x=1706943847; 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=6ub9A6wmgZZ69IN8DL5mrbWBIpsOdhkK0mC0Jif3FTI=; b=Fw7I9w1aNZkSRe/peNIQ9ZVkxzjpQNeRSCA6JFLLAeDQV1QVkss2HntI0mLgHdvxIA 1tvTjXv/AkIXRIBA8Vk88lfdndP46wU6rnpZSJrbAzBcAdCA/hvc+f5hkyBcUW4csK/X //tDPMpCW07NEGoPhMCP13DNLlrmdWXHhPsHuRQHrQ3uuTQ5D0guZyfX9jKG6ja3AG17 7M0xuVD6nvmVqFA+we/l2thJUZ2uwmZOxucztSSrNuIierjbwxPMLM5KhED4CDpGvfcj 93vINzWrYD4oRddubi2j/Hp4j0GZzWOqHOzJar+0I4fNRLR0Em1PHkgz6gdV15uHQ1/o +jOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339047; x=1706943847; 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=6ub9A6wmgZZ69IN8DL5mrbWBIpsOdhkK0mC0Jif3FTI=; b=a3IJ029mjpaEawoxYLS7Mk5Owed6FJCJWuKNONaENtUdQl6DKNhlo+z5j4/iiw32Tn 8itEeXZjhAHuoBfBu7sRTV/aeW8+sw8WjFspzXoEMJm4GicTy9y663AN1Tlgs7/HEMVs gOdM/6Nk2Q31VsPzY6jotqy/zh/5cyJ+s0OPrY13h1gSb1ZCIE75t9R2s2V8p7ipifNa E4U1GWldiMIRWSdiw77txzarASRPmW0NJb2Tw2oh8HAushJc001f0PIK2x+QyPQaRJUc HVRIMzfipbud4EuLPRNB4+7oc3LeNy/sZk1xWSKdrOnElNjsQvc1Bmg3Tld+Pgk8KyX1 3vOA== X-Gm-Message-State: AOJu0YzQnQNtZhC+xJSe6siETNjKN2L9ZsTh+1HAQkvGV7SYBD7cp/BC gS+FtuOTAAiKqvaKDElT7r32rX4QBJKkmVQzev/yxffiN0E+hE7KjQlSk5+0LmM= X-Google-Smtp-Source: AGHT+IHUsaCTL8ALMVcb05EU3qd1v4t63zvXAuxTRk3wVj62/hKEXK7AAUK1VBZQu1Rn0cM93NkKig== X-Received: by 2002:a17:906:3614:b0:a35:2736:1962 with SMTP id q20-20020a170906361400b00a3527361962mr641325ejb.22.1706339047099; Fri, 26 Jan 2024 23:04: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 tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:06 -0800 (PST) Message-ID: <2093303b8a10981cbc420e90f5912d49b39146e3.1706339016.git.liliana.prikler@gmail.com> 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 | 291 ++++++++++++++++++ 3 files changed, 293 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..d4bddc5901 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,291 @@ +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. + +In addition, this patch changes how native-comp-eln-load-path is +constructed. Upstream, an entry of the directory “../lisp” is added +supposedly for bootstrap only, but this directory appears to find its +way into the actual variable despite attempts to remove it by calling +‘startup--update-eln-cache’. +The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as +packages may require it, but only pushes the new value now. + +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -4396,26 +4396,17 @@ 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. */) + (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 +4414,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); ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ 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; ++ } ++ } + +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; + +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); + +- '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 (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 (NILP (loadsearch_re_list)) +- { +- 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)); +- } ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); + +- 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))) +- { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, 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)); ++ 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 +4474,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 +4515,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); + } +@@ -5859,10 +5821,7 @@ The last directory of this list is assum + the system *.eln files, which are the files produced when building + Emacs. */); + +- /* Temporary value in use for bootstrap. We can't do better as +- `invocation-directory' is still unset, will be fixed up during +- dump reload. */ +- Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); ++ Vnative_comp_eln_load_path = Qnil; + + DEFVAR_LISP ("native-comp-enable-subr-trampolines", + Vnative_comp_enable_subr_trampolines, +Index: emacs-29.2/lisp/startup.el +=================================================================== +--- emacs-29.2.orig/lisp/startup.el ++++ emacs-29.2/lisp/startup.el +@@ -545,9 +545,6 @@ DIRS are relative." + (defvar native-comp-jit-compilation) + (defvar native-comp-enable-subr-trampolines) + +-(defvar startup--original-eln-load-path nil +- "Original value of `native-comp-eln-load-path'.") +- + (defun startup-redirect-eln-cache (cache-directory) + "Redirect the user's eln-cache directory to CACHE-DIRECTORY. + CACHE-DIRECTORY must be a single directory, a string. +@@ -558,22 +555,10 @@ to `user-emacs-directory'. + For best results, call this function in your early-init file, + so that the rest of initialization and package loading uses + the updated value." +- ;; Remove the original eln-cache. +- (setq native-comp-eln-load-path (cdr native-comp-eln-load-path)) +- ;; Add the new eln-cache. + (push (expand-file-name (file-name-as-directory cache-directory) + user-emacs-directory) + native-comp-eln-load-path)) + +-(defun startup--update-eln-cache () +- "Update the user eln-cache directory due to user customizations." +- ;; Don't override user customizations! +- (when (equal native-comp-eln-load-path +- startup--original-eln-load-path) +- (startup-redirect-eln-cache "eln-cache") +- (setq startup--original-eln-load-path +- (copy-sequence native-comp-eln-load-path)))) +- + (defun normal-top-level () + "Emacs calls this function when it first starts up. + It sets `command-line-processed', processes the command-line, +@@ -1362,12 +1347,6 @@ please check its value") + startup-init-directory))) + (setq early-init-file user-init-file) + +- ;; Amend `native-comp-eln-load-path', since the early-init file may +- ;; have altered `user-emacs-directory' and/or changed the eln-cache +- ;; directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + ;; If any package directory exists, initialize the package system. + (and user-init-file + package-enable-at-startup +@@ -1502,12 +1481,6 @@ please check its value") + startup-init-directory)) + t) + +- ;; Amend `native-comp-eln-load-path' again, since the early-init +- ;; file may have altered `user-emacs-directory' and/or changed the +- ;; eln-cache directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + (when (and deactivate-mark transient-mark-mode) + (with-current-buffer (window-buffer) + (deactivate-mark))) +Index: emacs-29.2/src/Makefile.in +=================================================================== +--- emacs-29.2.orig/src/Makefile.in ++++ emacs-29.2/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. +Index: emacs-29.2/Makefile.in +=================================================================== +--- emacs-29.2.orig/Makefile.in ++++ emacs-29.2/Makefile.in +@@ -329,6 +329,7 @@ TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. + unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++export EMACSNATIVELOADPATH = @abs_top_builddir@/native-lisp + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` 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: 59453 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 8BCB227BBEA; Sat, 27 Jan 2024 07:05:17 +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 ADCE827BBE2 for ; Sat, 27 Jan 2024 07:05:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckM-00025I-3t; Sat, 27 Jan 2024 02:04:58 -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 1rTckK-00024N-L6 for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:56 -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 1rTckK-0004zs-Cz for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckR-0002YZ-7w for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05: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: Sat, 27 Jan 2024 07:05: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: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.17063390719739 (code B ref 67260); Sat, 27 Jan 2024 07:05:03 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:31 +0000 Received: from localhost ([127.0.0.1]:53337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcju-0002X0-Uq for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:31 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:51355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002Vk-M1 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:21 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a271a28aeb4so98549966b.2 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339048; x=1706943848; 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=Vt++/W1dbR9c56TQb7mnpLXVe1L6Z1scYX4xVYtc++TisR1K/q1RmEWKVBH683hJT+ qOPGTIdLJ4+oYVI4xHqy0OzNFRvp/5uqitbJqXDFL6sWokX3CdS4IsQ2xmK7ilJSjI3d 39K3Nx/2fmH5OOZYV+/My7jlBsKxNnaQ6iEV2LoMv4X6WqKPLSDPctNxjsrw6qq88DVU xcrYbUWIXeYjLD4uOO/Suxi9LuIPVRIW0ZrYKKV7WQss1InBZmQaun/nenyka2ex/6ci nj8w+zVDk5Z26JXnWJa/tJsuGrhgdPI+xAncXwnsEjEGydydq6ZJLmtfUyn4FmyKLhLn tDIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339048; x=1706943848; 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=m/hKi6BJOGgyoxKzGRKTS3xSCpplj7/GthA5FXCsXlnCzeoog/M6J25gnhP4cVoA8c 5ML75XPz7/8Yzgj2kiMrxq3rSqKIeEr2tlwhjZVGvVd2ThPiMjlW0tca/YlzEsB1Tc7v LTs63IVcM/JeeysWWYD/u0ohbFYXLC/gG3ZhnBAAFQgfdpzNbG8NQx6WWHj0fSZFXmbk smiev1rd2m0DRofg/cjEHdCpWX0ZWH7bmKh4N1Zg2U2Xp8eIIwewoGlCVURuNzI9qlpP DzgrH5VVNH8fg4QLrAwlhbDUhD3WYAO294JyB6AH7OdhTdnWe+GZOxuCqavMX9eF5l7x hgFg== X-Gm-Message-State: AOJu0YzPW3v7T6WrYdL6nnClqGmBq6kEmbPULph+RPj4K8bULglfeI/I dAe5bwp+I8afJYl1dYF65/YKVGc3AasRjsDqvPHHWz02UMAD9TH+AiIfAuxOujI= X-Google-Smtp-Source: AGHT+IFtl7dB5ODfNIrGKoZtJbuuq04x6rLExEOsqDYxCiaPvutTlb9XOw7TRcK4HRuNeU+VmYe37A== X-Received: by 2002:a17:906:470a:b0:a34:e324:c8d5 with SMTP id y10-20020a170906470a00b00a34e324c8d5mr548185ejq.33.1706339047844; Fri, 26 Jan 2024 23:04: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 tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:07 -0800 (PST) Message-ID: <61d7784b8133fe9e806f0c88a66a88c62772f35d.1706339016.git.liliana.prikler@gmail.com> 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"); 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: 59452 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 E5BF027BBEA; Sat, 27 Jan 2024 07:05:09 +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 76A8D27BBE2 for ; Sat, 27 Jan 2024 07:05:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckM-00025f-K7; Sat, 27 Jan 2024 02:04:58 -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 1rTckL-00024b-5r for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:57 -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 1rTckK-000500-UD for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckR-0002Yg-Qi for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 5/7] build-system: emacs: Compute relative file names. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 07:05: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: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.17063390719746 (code B ref 67260); Sat, 27 Jan 2024 07:05:03 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:31 +0000 Received: from localhost ([127.0.0.1]:53339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjv-0002X2-Dz for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:31 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:46357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjl-0002Vl-CI for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:22 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-a3536102785so25697466b.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339049; x=1706943849; 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=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=k45B4uBi36tCwsquiZvPWeYUFX805MzT7rpjsJSwNl6VynmltenLgSfeey9YFtNCA/ JSUawGMRGUzXc/+tdaz9DK26Bcu6ATqM3wws+IzspDmtBLpm1tNZc4pl8ncsVF/Fmcyl 93R0GQMYrK8IGoF2eIzuJ/AcPv2sCW1aXCOv40iY1684YntZCxW9fmxLdyf+SE2/SeBI lcYVgB8p5flbW8NW51tbBolRBZUdHxW8YTeq+6NoiQvHobcz1Xwu7+QUSWLJrl/TR3+a pAHBUtMXSviRGEuERcpt+HvUbeI9zfbAjiJhUOhhbXaKuhSjEbflie5/o1x6Sm5cjqiR XLuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339049; x=1706943849; 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=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=E+QpR0BkDez6g9cYiL1SUSFcZ30C+ca1hatSglw+EU9NI4ZtFKZpiUNP5FIB2mDJAf 0uixNoeb4uezMjwLupuCNbRZYmbf41o7QV3am6E6lZY9dkEuXSFP/0mXhcBAAPXj/mS/ LRnVRagsKnxyh20utP9javHQzjW8e9u2RH8L9dZ4/OepkzOn1j6s6nxz0t9UASl9snNy x8ixhhRQXgm+4W+CX74s3V8Iq8H2yS3+NyHvULm7o8nmavDLfv3d5UFR8JbsWOuz0/Dx Q1tuHQTPlEaO6gGID/1rJovSB9xWGeXM2yXnkG5249yfDt2rbHOtC4zC1q8xJYt5cCtY xt6Q== X-Gm-Message-State: AOJu0YzXz3DV6nzK/DvK2NQoMBJDo77GbivLRm2/m9G8YIh8wJIza4VU 4PaUoF+u7LfL3o2FtNoigIOuNrzS87M2Z8g5p0bXEWrGqy5RyaZSq2IcBBtB094= X-Google-Smtp-Source: AGHT+IHocwoV4F+qnJpcfeTmdCMhaeGoFofNgcefM0flGEhUPh/IjImedWg1SH3dnGbJb+xbObJ1YA== X-Received: by 2002:a17:906:4ada:b0:a35:50c5:2038 with SMTP id u26-20020a1709064ada00b00a3550c52038mr115212ejt.6.1706339048671; Fri, 26 Jan 2024 23:04: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 tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:08 -0800 (PST) Message-ID: <174b0112dccebee22b08fc6931980766c0653c1f.1706339016.git.liliana.prikler@gmail.com> 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: 59457 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 5BB5C27BBEA; Sat, 27 Jan 2024 07:05:35 +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 0415427BBE2 for ; Sat, 27 Jan 2024 07:05:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckN-00025t-Fj; Sat, 27 Jan 2024 02:04:59 -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 1rTckM-00025H-2O for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04: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 1rTckL-00050C-QP for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckS-0002Yx-Mc for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 6/7] gnu: emacs-org: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 07:05: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: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.17063390739762 (code B ref 67260); Sat, 27 Jan 2024 07:05:04 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:33 +0000 Received: from localhost ([127.0.0.1]:53343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjw-0002XH-Ns for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:33 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:54276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjm-0002Vq-Fy for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:22 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55d2d9fe0e0so957777a12.0 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339050; x=1706943850; darn=debbugs.gnu.org; h=cc: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=LO560fD+6BrpgFPX/tTDtcDJHFs7ezu7Ti/qRBlfMwbYG6IeQnDn2J9pfj/stwUb52 QzBdp++AEYj28Op38Q/IJlWU1GkgHlc2drr/WPzrEdPgqofX1yXuACUvFk+QMHz1OjO5 Bt0TjT5ZzEeutPhvLK3mejYvTg+Z9CjI22/lxOuUI8YYOeo8xcQqbtsoiYqAwrQ/Fbjc XyzxbI4nypiYiJJnrTrs7yBFkdd0PdqR9f7Q0T0qKPTXniWPpds5vWeHk1QiJjRZZNrX kqF/U8pMW0UxY/0lAGxedcJOqcUu8DJGkgxczATEWSN42u3CT0eoKwZ1fikmqpjzfZor ObaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339050; x=1706943850; h=cc: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=aFnfYCQEcJKOijws3CM9MbcknHR/qE+kr4xrf8Buhd4zXSyYW+H7vCv6ug2CQ32Bcf rbi0VSc3koYw9E8kMZvT8C8XWg7qtqiDJSFZJsl2xiInTpSZHbpqBBZ+jpZ+TDRNuY8t PbsX/kyPHErkjVbsY9RNoWsaffQJ7wfeJGKGISjN+IKQEr0Ij5OlIw2MgdMVZLuYolIJ 66lj0yTNue3Oxg6I5V2rqimtpIHDzJ2T+wdow+C1mGCao+419T+y9wcQC3ieQyA/i5dx 0k8XY/kPlM3akZdYt5CZLc+3iDFcgmoe4D4jDyMYlVdjym1bjgFJcDUoYZOL+kbI5eSz 9ouw== X-Gm-Message-State: AOJu0YzcnqJtOCLKe+jz7UR1BXV3K4L66F3I6TPC1DSOFWpiscMpQKLK p0TVY5GWLY6himVavjU5eDIId+Kwuq/CY8snSu7q/r4u6eEReqmgXVU1ZmAyuhs= X-Google-Smtp-Source: AGHT+IGMM+n1ZUrDbRtRgKKxCNynQfy4iNzdxbbg1wEDYBry9q2nnmOjc7cZ67K7RLaWVXyK3Nmo6w== X-Received: by 2002:a17:906:ca92:b0:a31:3a5d:c853 with SMTP id js18-20020a170906ca9200b00a313a5dc853mr540019ejb.49.1706339049599; Fri, 26 Jan 2024 23:04: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 tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:09 -0800 (PST) Message-ID: <035c884186662330fe3a3d72153e8d57046df525.1706339016.git.liliana.prikler@gmail.com> 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: 59455 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 C05EE27BBEA; Sat, 27 Jan 2024 07:05:21 +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 166A027BBE2 for ; Sat, 27 Jan 2024 07:05:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckO-000270-S3; Sat, 27 Jan 2024 02:05:00 -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 1rTckM-00025W-I4 for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04: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 1rTckM-00050I-9K for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckT-0002Z6-5Y for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 7/7] gnu: emacs-magit: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 07:05:05 +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.17063390739768 (code B ref 67260); Sat, 27 Jan 2024 07:05:05 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:33 +0000 Received: from localhost ([127.0.0.1]:53345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjx-0002XO-3L for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:33 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:46358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjm-0002Vs-Ui for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:23 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55a86795a3bso709296a12.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339050; x=1706943850; darn=debbugs.gnu.org; h=cc: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=aBF9uMm6UNUiR6GeOppIeC2F45I+WpCiPg9O7WZGH0RluW+sYkQyGbDq6Ya4seC6vG E762G/UH/NMolQC68uCPt/WyHIeO0/nlFTa9VYdag9TXOsrwrYA1wbSRB5TzTG5pL8oP /xY6FrNPbwUoiVhbToiUdJD2UdbwHZcbf7nhyQJPsYrmvfZoJ7u0V6HJ4jB+V/FQRdwL TTpnRXTzE2y8xtlM8sMvrryPpCPItlhoZ5IOlYn/7Vc7Lk742WjuUL27aK7Ff0cE9YKd zZkpASbwkYzIA4E34BB5w9caUDmU95jJGFGJNycVLdQlQmWHCFf+7oEIudzqFof/NPOR NP0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339050; x=1706943850; h=cc: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=HQK7J6CXOK4IYYcQihA5Td08DWRjppSbKiGezoWKm0zBl23/u7VRk1L1ppzgdaicwk vLDg/2P/oFUkVE3XCU9m/Ex3Xe2bC4JEIeZaGtRGebh2cgjELDwOUSIw8Jp7HPjKAz39 NshOj16YUc5myQbEwFHTx3/+YPQoy9XKpeBlHPfQVxeDhS2BTl+aa4uFTcnU0iYmodAl qq+ji0sA8h+lLs3c/vbj5+qF0JBJo/fxblj02tb1QzFS9rSrVygUUDIKNU+OJ1Oa4MFR ZCz4tY7QOEigTIhX70E+y4JGzMO7Yy/YigF5UulGS8PsgjIeGc/yy5NWGYaBUw1Sxz2m SziA== X-Gm-Message-State: AOJu0YwcjixqYPDxlv7QDStwxjYFuDHCx6ShQ5RgVUZoBdcP86g8GTCm dUrn1AbV37u/k4xeEBDtg9Te+UsTs3krdKbXPy02vbEpJ/kN9rL9xcL4IjsYNNc= X-Google-Smtp-Source: AGHT+IG3Qgbu7eWRYnKUFQ8fCua7GupfsyeM+6/gvlmA5Dy/DnV72HnpVqD9uccWED4bKfSecofhUg== X-Received: by 2002:a17:907:170e:b0:a30:8d7c:4e85 with SMTP id le14-20020a170907170e00b00a308d7c4e85mr540944ejc.35.1706339050374; Fri, 26 Jan 2024 23:04: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 tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:10 -0800 (PST) Message-ID: <000095599a15a189aeb1063d433d5105b9bca698.1706339017.git.liliana.prikler@gmail.com> 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