From patchwork Tue Feb 13 18:30:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 60282 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 3DEA727BBEA; Tue, 13 Feb 2024 19:32:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 C951627BBE2 for ; Tue, 13 Feb 2024 19:32:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyWC-0007xD-Pi; Tue, 13 Feb 2024 14:32:36 -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 1rZyVX-0007qz-KB for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31: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 1rZyVM-0004Ga-Hy for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVe-0004Fj-3H for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32: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: Tue, 13 Feb 2024 19:32: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.170785267716210 (code B ref 67260); Tue, 13 Feb 2024 19:32:02 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:17 +0000 Received: from localhost ([127.0.0.1]:47400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUv-0004DN-Df for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:17 -0500 Received: from mail-lf1-f49.google.com ([209.85.167.49]:61615) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUt-0004Cr-HQ for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:16 -0500 Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-511831801f3so3586561e87.2 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:30:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852592; x=1708457392; 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=fCiWq5c/taiUsyHC3y14QbYPa3eWgIEmDzE9QfxVfAzgasJ71RHIMVrGGxfibWxuy6 gurUd6lzwEthoG84i2O1nb2bA1cojh23Qg/n0jvfnVdNz5qwbakhWCB0zYtDgpxHyZ2W spMkNrybPdfI/uwT8c4Wbmb21AVb0+sj4FzcS29iN+wRs+wZo9Q4Q5ff3q7epHN2eq21 SiyF53xd8Vf2KSF/nDNIH23dTFR4hBLXwpF6oS/1H+/hbli10Pp1wGrZrsTB86YmGT7R ArtL3x9vnxsNQMfKF11vsccnljcvySirdo5C1XjRb+jeyk94f751IFb8qtJwMW7GQTYm ZF4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852592; x=1708457392; 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=bR5APIAvr0LTr4Dz7N44ZBp/hWXxGxI1Urk/RSCiJOg4rKZYoNZPclxihdE7cTl1qk bFEZVwK0g92YSEP6rsviWxxyYxgIDkSDQ0cK1fcgZBGpXqWXMo0S0Hg5Uy1EcD5iBIPk 7N69cRVeKdAqJrWpI8wowiUqQmQgg8Igy1BsguCv5KexhN8ZA2+NXqglfWwX0qQkzJtp +MY6clm85GrhCdzpscJ1IaOybGvhKkb1rEpuRd6yvUfgviWMSDNj+0b3rEMgDZ+7kMms AtkeD9J+xkuGG+ef2Kwl3+EmldtfDo3kNZqz3C6KWwj0TVChmjHGSOhKGTjYqK/6mWN9 vYCA== X-Gm-Message-State: AOJu0Yx4Tu9V0uAc5VLkoRanmJXELBOLxzADcA8Q4ZtLP3RHIKXFPvOC NCnNz821qT1DHEsMX7BjmZY7h6B6ZCAHnxWXmravsmyRI6U6qsbhG7bnYMOo X-Google-Smtp-Source: AGHT+IG8rGi/tne6/LXFijVTmi8IQc1Pgmbq4qxVyCtSzEkmMQGzxOhqIcjVCcr7lI4dBNn5RMpYLQ== X-Received: by 2002:a05:6512:3a8b:b0:511:6764:a8c7 with SMTP id q11-20020a0565123a8b00b005116764a8c7mr455446lfu.10.1707852591610; Tue, 13 Feb 2024 11:29:51 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCU3NqobwQxymWQQzX6WjF1SHt4R2eesN8jMrdSVVfqVJAmGIksBsOiQixULEGtE4rhpbsxkXdHK29nKXM28fOP6ue8BTygzPrReNSKPvplK9Ut0m9LI43nh4vjtYbSd Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:51 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 Tue Feb 13 18:30:50 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: 60284 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 0EDF427BBEC; Tue, 13 Feb 2024 19:32: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 8D92427BBEA for ; Tue, 13 Feb 2024 19:32:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyVm-0007t9-J3; Tue, 13 Feb 2024 14:32:10 -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 1rZyVX-0007r3-LN for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31: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 1rZyVN-0004Gc-25 for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVe-0004Fr-Jy for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32: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: Tue, 13 Feb 2024 19:32: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.170785268016235 (code B ref 67260); Tue, 13 Feb 2024 19:32:02 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:20 +0000 Received: from localhost ([127.0.0.1]:47405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUw-0004DY-PN for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:19 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:57388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUu-0004Cs-IR for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:17 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a36126ee41eso646864766b.2 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:30:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852593; x=1708457393; 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=kDYfN8M1+fXYjbA6CYKqrdhQc4X2H2GVQmzkmZ/uDdCISd/d/qLNRYuRC/2CokEZBq V5WJAafhFcm8Mz8wcV37VM1Audrwu/aB2sDaWX43BKvUJFA6JT9fN7oE3p80v6sfKWIr G5rjRKIL68wU2smGk84Na/IINpf6zJGhACgc3BEBIZaTRyoyEynh0gT58wOaGatnv0qO uBZqa7NrpCvl4T82tpwbSMixL275NI4Z8ZdtzkrIh4GCvlE5AhDr2UZpzJlA07k7a+FB dDFzw3jQ6aEqKAXDGIAhwD/FywlbxyJC0in5XwTqbcGjD3nnhznP6XTWmkh1U2GfBYei JSFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852593; x=1708457393; 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=onMawsVxn8i9PdXwiV2d8b7tmcu6S37p4j25dZk+8bp5eVl9RmYqSzAGNAwJRB3zNj ODlOQvFgRESMQqDTmxXUIfCMMUcfuqNP48v1VJnX1UGXWRDMQhyRWKlQW337ZBkayYF7 Q/joc35PwNlBVDXtT52iLePDIEH0OG09fFxV95n0di6+m7Y1dwEmUWGRtMBlc5OAt5Op X3o569tMpCl60zWeaxfTCKOUrLJBgEfpppzNFTcPHgkPXGl0S+9xrUGt6i5FXiOzd+si Cfymrky+zV55VHau5plscQWXWo+3SoTusJSR1PPYMSYbx/eG0n1HqsiB20ExFTmAB/GN BqSQ== X-Gm-Message-State: AOJu0Yy8fWzOU4IEW8B/DCjhkpCT8pMidRX/Vkbxpn3+CPb3S4q9kXqC A3LQT2eFUx/cha6YMrghHcAaqIxr8El/HrqSAe7JVt8XRDNe+xjZHO2lI8TU5po= X-Google-Smtp-Source: AGHT+IHzuaeobhW0YW2RJakW3Isww7Ym1nOXaNd6r77g50Y3l7hnye2eGLsWUf/OlGl37c0+tXm06A== X-Received: by 2002:a17:906:4a10:b0:a3d:19e4:113f with SMTP id w16-20020a1709064a1000b00a3d19e4113fmr222178eju.76.1707852592923; Tue, 13 Feb 2024 11:29:52 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWQyJKi6MazaMNlE7eIHEUUCRJfGxyyurFJlNvUQBSFgaamSb6Lv9cqvTUZDKY+py6t0ZO2R4FllYZyBxEXt4jPyFSUmB2rDeI04kQPASPsnPmuxfro9QtuQWIhAQj3 Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:52 -0800 (PST) Message-ID: <4fe9c932cc5f7d959df5cbc801dfe43f7f817385.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 Tue Feb 13 18:30:50 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: 60286 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 13A3527BBE9; Tue, 13 Feb 2024 19:33: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=-1.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_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 72C0927BBEB for ; Tue, 13 Feb 2024 19:32:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyW3-0007uy-Ow; Tue, 13 Feb 2024 14:32:29 -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 1rZyVX-0007qv-JF for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31: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 1rZyVO-0004HD-UH for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVg-0004GP-FS for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32: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: Tue, 13 Feb 2024 19:32: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.170785268616286 (code B ref 67260); Tue, 13 Feb 2024 19:32:04 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:26 +0000 Received: from localhost ([127.0.0.1]:47415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV3-0004EV-5L for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:26 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:43206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUw-0004Cw-6L for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:20 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a30e445602cso16317766b.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852594; x=1708457394; 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=unx0WlA09N7LGaCQR5w6UZT4NRsTI6qSoHqG9oNqu1k=; b=f3ou0R0toySzjcGs/OpJ7NrHJle/YkyDtynVENB52lSrv/7gpJH5twToxxk36uQsCg LvoxsW7VGV5Th+FoWUgew2zr+N2g9nDsf89AgI/1Bw7k9DB8arP8DMiz+mozlshFwtF0 iwUOVDJJtA45bExaoDlcdrksxQ/5k5p2wzyxPY83Y9qs3uP+1+Rlv+PvaMM/06IoOYbX OezlqiR2I9iNtmRgaS2j+xWd030zS4GJYaaUkfDSG+F6vUfops5vzRDKxx3Zh9yDwqXo orvT5YXQzN/zkQXRa9cWnT86ihTBpcMBoB7KS2X3q3lY+ysqa+Z4HNX5a+T8RNv8tk5/ niGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852594; x=1708457394; 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=unx0WlA09N7LGaCQR5w6UZT4NRsTI6qSoHqG9oNqu1k=; b=HdFFaiks2SG1Bh00k21gr8a+0fgEg8Nc57SXDDxv5x9hnxlwYf8EzdWQA0lBD+/oMP AfltM1JBDxfkYY0I5haB7ZwAyzqPWnWZ1m9Bv9EvocRjoYKbcHcUUsMVToCXg4ROqOR/ Dav/ZEgrRuCjaFL2Ie04p04OgiZodnoMIiwX0JMhb/Zyj58NkLugXaMLr7L9DB2WPNP8 rnCKVVFXuUKPEbLj6cdKfrf1MEWhwRTNHm9ByS98tRZo3bX/vWVIyUnTE5pRPSfqggv7 tS2R8Pvv1Em5zIkM87xRL+drRA0kWt8i/QzqITF9Sw5pTzhJHCFCrbKoabwXvsoakyRc JxVg== X-Gm-Message-State: AOJu0Yy8EXeJP1py9tSZ2T1/w0DcqGyoW2DnNZkldvE56BJ7tRs77+hd EEgROkqgAouh+8dmk1MKa1y0WAoK+UsLMB5Oncj0XEq22ycP0KcFpJ20JTVP1xk= X-Google-Smtp-Source: AGHT+IEedvko7D2Bq9FpivwFzEuHafO1XrBnG7bMXp3elaMLyn4sBrMQoi84EcqhskylCGRSQ0vW/w== X-Received: by 2002:a17:906:fcb6:b0:a3c:2c8e:9030 with SMTP id qw22-20020a170906fcb600b00a3c2c8e9030mr2960352ejb.6.1707852593670; Tue, 13 Feb 2024 11:29:53 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUGygQtxBh+eNXddPovI1bQhXHKBySGEtPJRuLA4L7qULdHTrHY6ZXVLF36AfUXtMbFHNKvgmeRL4W2E4yhQCw0qz62nYC3bvJK4Lsu3OhgoI0gCqN2QTzhBZx4Ca/l Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:53 -0800 (PST) Message-ID: <60a52b40655fd27afa7d35564fb640c435c215b1.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-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 --- Am Sonntag, dem 28.01.2024 um 16:17 +0000 schrieb Suhail: > What surprised me was that not only was the "preloaded" directory > special-cased, but so too was the last entry of "comp-eln-load-path" > (which I imagine is referring to native-comp-eln-load-path). Judging > by your message, I'm guessing you're well aware of this. I, > unfortunately, have no additional insights or suggestions. Welp, I managed to find a workaround. The emacs produced by this patch has its own native-lisp directory twice (once per wrapping, once per bootstrap), but it ought to load your natively-compiled whatever fine. Cheers gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 322 ++++++++++++++++++ 3 files changed, 324 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..8e9f9a8fd6 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,322 @@ +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,54 @@ 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 directory = Ffile_name_as_directory (XCAR (tail)); ++ Lisp_Object len = Flength (directory); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ directory, make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, 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 +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); + } +@@ -5863,10 +5826,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 = emacs-lisp + 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)'` +Index: emacs-29.2/lisp/loadup.el +=================================================================== +--- emacs-29.2.orig/lisp/loadup.el ++++ emacs-29.2/lisp/loadup.el +@@ -53,6 +53,13 @@ + (setq redisplay--inhibit-bidi t) + + (message "Dump mode: %s" dump-mode) ++;; Compensate for native-comp-eln-load-path being empty by Guix' default. ++(and (featurep 'native-compile) ++ (equal dump-mode "pdump") ++ (setq ++ native-comp-eln-load-path ++ (cons (expand-file-name "../native-lisp" invocation-directory) ++ native-comp-eln-load-path))) + + ;; Add subdirectories to the load-path for files that might get + ;; autoloaded when bootstrapping or running Emacs normally. +Index: emacs-29.2/lisp/Makefile.in +=================================================================== +--- emacs-29.2.orig/lisp/Makefile.in ++++ emacs-29.2/lisp/Makefile.in +@@ -110,6 +110,7 @@ MAIN_FIRST = ./emacs-lisp/eieio.el ./ema + + # Prevent any settings in the user environment causing problems. + unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++export NATIVE_COMP_BOGUS_DIRS = emacs-lisp:international:language:progmodes:term:textmodes:vc + + # The actual Emacs command run in the targets below. + emacs = '$(EMACS)' $(EMACSOPT) From patchwork Tue Feb 13 18:30:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 60285 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 4E25927BBE2; Tue, 13 Feb 2024 19:33:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 710DC27BBE9 for ; Tue, 13 Feb 2024 19:32:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyW8-0007vL-Pa; Tue, 13 Feb 2024 14:32:32 -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 1rZyVX-0007r0-KT for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31: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 1rZyVN-0004Gf-F3 for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVf-0004Fy-0F for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32: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: Tue, 13 Feb 2024 19:32: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.170785268416263 (code B ref 67260); Tue, 13 Feb 2024 19:32:02 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:24 +0000 Received: from localhost ([127.0.0.1]:47409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV1-0004EE-R6 for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:24 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:50398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUv-0004Cv-TL for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:18 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a38271c0bd5so597782966b.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852594; x=1708457394; 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=A3DWsjBZx9+0/R70FWM+AN91HMhqnnh9kiwU+sBIaTK08pdUUy65OUxzYBP21wQmvk F7b260fNE0Q+Tn5BbPzC5f60dgLoe7YzpXTnlYqswuxVdmEyp2EEN3RTxWw1b414D596 lApXoqb2nLBTmP7mI2OxciWjlt1eHNEEeqeEEtxHgLcJkACz6ogTNBwg6ZIdpMkSB4J5 abkZe6tgA6bFAEbbQCZj65X7itDsZxCA08Fl/BuxzuGs62WpxbcJ06MAMr+90Lg4oUPG NbjHIcD4IBkZxwVSvC86GmhZLi3TAqSpR3hRmMqvU+JeW/QwHTIyLi88bn9zJEQ7ZeBk b9sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852594; x=1708457394; 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=dXH6IbvblAcOFd3B+FNBtcwhJR3wQY0n5pgwKdBX9hhKvXaFsU1k9dg1MZgu5Lyb+B FlL0ByDRtFjNCF5NmfZgY7peKXuqPLN2MotTp/ZMTBfu++sj9oFBlZlBkIDUeDoYGrzJ 4OsUz/TFjb+rgwmjnh5hduNtyDw/yoIsNQ98XEWCp4xX+SnmaNCwFtjDvWOxqp5InYmu uHca26BzlLeRjGVIo3+qijW2JTPShbMqfPD/exmlNpNjS1bxIHXJCXcuwWDbWDPuz4ht MLHITpnf99gi9XyCtVnNBQwg2b4ZF0BtijV1UKvl7FS4Dxc6ynE58xHoNXtT6rRvKbl7 maOw== X-Gm-Message-State: AOJu0Yz7g9U+Yv7i9yzu8nxnMK387LZRqr2s8MdGjxbutMbwsgo/LehB p8AM26vN/9Jhkm11x/1yrXQOwMIMYQ4GgMht4WmRi945g9tUDv3+fIDaU3RIcg0= X-Google-Smtp-Source: AGHT+IG/2anms+UQ6gr2OBbHpcTAS8r9N00PDt8WAjnPERshcV6H3kfJ8rggSi60O38tjmY3syzRmg== X-Received: by 2002:a17:906:eb50:b0:a3d:765:7bdc with SMTP id mc16-20020a170906eb5000b00a3d07657bdcmr236089ejb.25.1707852594374; Tue, 13 Feb 2024 11:29:54 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUMAHHx8VzazGN/Z7CGqUi0hl+d61cmEMDvwv1qTFxv0kcjA39BANNvDy0ZMqlyUwG9rhfgOOSNaxwzf5d7x7q8DZL2PeI5+jgsMxNxy9/bd/EsYbSUIRZz9MBR1zzP Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:54 -0800 (PST) Message-ID: <2188ddbfcdabbba12df18a4c3af34b123ea8448d.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-disable-jit-compilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[patches]: Use it here. --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 3 ++- .../emacs-disable-jit-compilation.patch | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-disable-jit-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7e6a0c5006..9121f13b39 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1112,6 +1112,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-elpy-dup-test-name.patch \ + %D%/packages/patches/emacs-disable-jit-compilation.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1caa2cbee0..03c50eba6d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -108,7 +108,8 @@ (define-public emacs-minimal (sha256 (base32 "1p3h4sz8da8vhix5140g2qkdy8mz11d7mmvsym5vy847k1428gbx")) - (patches (search-patches "emacs-exec-path.patch" + (patches (search-patches "emacs-disable-jit-compilation.patch" + "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" "emacs-native-comp-fix-filenames.patch" diff --git a/gnu/packages/patches/emacs-disable-jit-compilation.patch b/gnu/packages/patches/emacs-disable-jit-compilation.patch new file mode 100644 index 0000000000..8b1ac5a9df --- /dev/null +++ b/gnu/packages/patches/emacs-disable-jit-compilation.patch @@ -0,0 +1,19 @@ +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -5648,8 +5648,12 @@ For internal use. */); + doc: /* If non-nil, compile loaded .elc files asynchronously. + + After compilation, each function definition is updated to use the +-natively-compiled one. */); +- native_comp_jit_compilation = true; ++natively-compiled one. This variable is enabled by default upstream, ++but disabled in Guix to better make use of precompiled packages. ++Notably, Guix removes the hashes that prevent inadvertent shadowing ++frm the file names of compiled libraries in order to facilitate grafts. ++Enable at your own risk! */); ++ native_comp_jit_compilation = false; + + DEFSYM (Qnative_comp_speed, "native-comp-speed"); + DEFSYM (Qnative_comp_debug, "native-comp-debug"); From patchwork Tue Feb 13 18:30:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 60281 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 A3C1027BBE9; Tue, 13 Feb 2024 19:32:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 9D12D27BBE2 for ; Tue, 13 Feb 2024 19:32:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyW2-0007te-HD; Tue, 13 Feb 2024 14:32:26 -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 1rZyVX-0007qx-KI for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31: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 1rZyVN-0004Gh-Us for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVf-0004GB-G7 for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32: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: Tue, 13 Feb 2024 19:32: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.170785268416271 (code B ref 67260); Tue, 13 Feb 2024 19:32:03 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:24 +0000 Received: from localhost ([127.0.0.1]:47411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV2-0004EG-C8 for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:24 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:54461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUw-0004D2-Bu for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:19 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a3832ef7726so564141766b.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852595; x=1708457395; 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=cGWrrSYNEVAOevKGkjDPbT2MejlDiD3jPVeFtWlPW7c2f6wgbyguqdidnANHIK8EA5 GPTmZdJj/DF10wApSjBfYyOeaKpNX9g1/V0K9DJI7q9sZNyi7TDfKDHTlKOlSPWNC3Vk SQeFm1NjqoCjNGPo/l+BnrPJZAe3QppRVHJTu2uv55ORcKlHVbTAT3Jz0QPFCH2qNBEF yqnYttH0cQ+g3gFZuc8bTbDi+fGsiT4wN1UHiBXliGrjt9Chiuqa8sSKGwVZzZ9e6sZT NPJocpvOtH7TB5IflmQ+XKEJQidzEdD2PmXwP3UBOHSCHpSkI9g4p+iNAZyLaa1qwG0C tL5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852595; x=1708457395; 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=eYxltGf+FU2H7WqkEMhVUdiv2VxFXTsFX3iPBGV34oAckBxYPhjBjjOnKXydshxSJR ZT1mh93PFfXSM6oNlVTMTILho/LzuuLXu72P8CHk3DStsPhDPsMNa+hZSiKD07RhMFFq 1a+HNWELGfpZV6HtZzh6ZKeJ1pGPbHL13B/h8QPFbVC1CXNN0btV/LEAvCYfAQi+4KGo QG4Y5gXwvU5xoqHTfzAkuHA18THLz+QZh1Q6B3ka1sFwm7fSPwJSEgeBnnQsP6wIaelo BzNd/Y12hy56+u/6cpofAFTQ/V+4oBBdNwSm5ENY8/XhsRY8hRFssX1KmJxjUnZnBJ5R Dzmg== X-Gm-Message-State: AOJu0Yz/IeScWcR3xuZsti1YyXC+UFguluZDsj5BQD2tphEUT387RUxs P3YLECKQ2ocgIjlBRbsW5AjqDaP5rHUs9PTYZpkpiKgvbyQDTBRA1JI51SHhQe0= X-Google-Smtp-Source: AGHT+IEULKh7FQV54+q/xeZbyOARAdIF+hDQfhTXl+AZITegACfGD2sxABPOa1U4c/pe136+/HRILw== X-Received: by 2002:a17:906:f0d1:b0:a3d:1771:26c6 with SMTP id dk17-20020a170906f0d100b00a3d177126c6mr247852ejb.2.1707852595112; Tue, 13 Feb 2024 11:29:55 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUT2KGqEAiReydhQKPn7i3L2jYYIbhxXpFzSXcyQjPEXZ6cIr/2JanQbJ7CzBt5izDZjI6mTvrslzy0ML0Hvxi28PwLJGpTVjss9sCjv6m6TFZVeMMdb7vs+vDYG+Ls Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:54 -0800 (PST) Message-ID: <3604eaa2d70ad07a9c80c5166f42fad536b63a77.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 Tue Feb 13 18:30:50 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: 60283 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 E1C2827BBE9; Tue, 13 Feb 2024 19:32:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 E739227BBE2 for ; Tue, 13 Feb 2024 19:32:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyVm-0007sq-68; Tue, 13 Feb 2024 14:32:10 -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 1rZyVX-0007r4-LX for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31: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 1rZyVO-0004Gz-EB for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVf-0004GI-Vs for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32: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: Tue, 13 Feb 2024 19:32: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.170785268516278 (code B ref 67260); Tue, 13 Feb 2024 19:32:03 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:25 +0000 Received: from localhost ([127.0.0.1]:47413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV2-0004EO-N2 for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:25 -0500 Received: from mail-lj1-f178.google.com ([209.85.208.178]:56357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUx-0004D3-AU for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:20 -0500 Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2d073b54359so69679091fa.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852596; x=1708457396; 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=UroKhEej0FS6QK8rbL4HuWE8cY9tZMeI8e40BhDUBZqESeQO4//2L8/ft8Idmh6pDF kTYvnfKyiNUnXrN6hCG3zQQWKYri6QMgM6nx1KK76orpEPjn/c+2fVwBhHcwB1ztKyCP vAoJ3cnekpGEgba4qyeoEFiwivHYcWOk/4WLvJQHFd7b0rS2YN9SXIRWveAlg7ZTLNwh P6RIzdq/tz+UBY3Oi9EwsKFeaWPd/9BDk0YZIIZQ0SCc9fhrVjZErPcCer0YUu/QbDqL CSbpE6caABs6XVtM6OmRx16gve0ID7LdVnIlCjRieWxQxjGx+1jKcfRDpHTVEGx+vO8o goLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852596; x=1708457396; 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=ViFj7424WjGOMetF/R1ZeYPmEtlL2PKfNPkNdYYfzFnsZvtn0eW3kzKtgyADaCY6cb YrT8yNHcYKsnqf+EfDWlxrWEl6M1mWMYI4HFBqXg5RY1XqBMVOclT0rYLOM4izex0SLq L4kNJsbS8MQ63M9GSQwhBESHjYyyU8JThPnRHPqlDsZvwcoVMQg26nnTD60ZFbH7iOHx Ieo5N7woB6U8UkXzzWq6NKqBatcgZl94kjg7s4N13uGKtwvaYVZ32i9zeNQ4Qx+Bdcq0 8RUAWbDjvVstNBf1ZuXtRLA1VEEdbrIA/Droz0cS3cF/x/uaYr+JwebMe3qwmm4v5pVR NDDA== X-Gm-Message-State: AOJu0YwvFNrkU8HeTfxWCAw6dKGI+AOfrt6qVlFS2V3sprQCSkQhJRg6 9MlKXF7t2VQ7y55OGJl6h/UoJ3UdR/Y0+T1wXNhcdQ9WPRuFgKS4KlxpIzb9 X-Google-Smtp-Source: AGHT+IEr9YTHfbC7xaPqC5voPa9ZeZ5to4PexNAVI0BQwfcuxt3gtPynsQKd3ZIKDl/KW0Bkwc+xCQ== X-Received: by 2002:a19:7501:0:b0:511:4e8c:7d02 with SMTP id y1-20020a197501000000b005114e8c7d02mr355112lfe.48.1707852595833; Tue, 13 Feb 2024 11:29:55 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXQ1csdhj270MHYoi5VkGiYhK5pogp/paxNmxm4zjZuGgSI8vEqHFMBlL1yrF95OlsjawLyMy3Vn9LHwEL61XTRDBjX3WCGC1oZFE4KVolWQnd5TdJ/aJJ0v7ZsqySQ Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:55 -0800 (PST) Message-ID: <7946bcd3c810575ddb31ff84bce16b42375b7513.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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 Tue Feb 13 18:30:50 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: 60280 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 0669427BBEB; Tue, 13 Feb 2024 19:32:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 359E127BBE9 for ; Tue, 13 Feb 2024 19:32:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyVi-0007sm-7l; Tue, 13 Feb 2024 14:32: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 1rZyVX-0007qy-K0 for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31: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 1rZyVP-0004HE-GM for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVh-0004GX-1I for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32: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: Tue, 13 Feb 2024 19:32: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.170785269116302 (code B ref 67260); Tue, 13 Feb 2024 19:32:04 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:31 +0000 Received: from localhost ([127.0.0.1]:47417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV4-0004Ed-Cb for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:30 -0500 Received: from mail-lf1-f46.google.com ([209.85.167.46]:61616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUy-0004D5-5I for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:20 -0500 Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-511831801f3so3586647e87.2 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852597; x=1708457397; 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=C8Y/wZKEsMzUwMqeFVhNZOL8pxQtobx4eHVxn+jevRdMoZhPKBX7/heXhIzOLHKAvd C2C0A7wp7QMCYmSy1woG3dQNKWgDhSk6T+d/O81JTG9cBWx/WSwWfylVPiHgHaxfJJFQ DRyDpVJL1LO2oBsrs0RV6m8huEeyjV5e0iD0qeFEal7GuwLvEiLmbOky0lvSvcf31dLE DGUad3TVDOIz143ReOltN7K8uVa9WogRdWPoy2eIOAgZmxtnVwLD+FHDEEqIob8mXyAE tl02XFlZuGDvUFgrR/RdzE8LxVYGvtXJZ/iRzs9wP91w8h8uONedgHNaQyzQ9v6jjBoH 8y/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852597; x=1708457397; 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=wq8UGX+tqxBGwwcKhKdU6/oNQ0FtUcGN5ZGRO/lH/d1jZqB0QeUYWyoD8wLzORGoHk FiN7sqtFFtt8nvioW3pYssF/SmWHF/yIREDIeKCyrEq7qCKaUhdCuXq2y0yXVqlwlJLS NAbl9IZfbRRMDCFDZabnys4dllGZtw1Km8dforW6gypLhp3PU9YqHUPN6WNntR0vv0Kr FHR5XoS5UyP/tC2QB/dvdRtc9zSfI74P0jUOwH+bryxys3HAuqM03H0HnGxD5i/lYnLK V7LAoo0PQ8HAYIpQTgLdZmCEtoxILEAQHciFcU5OPMNrqeBMTYKAkObd92Pq7IFHO0Ed 3jmA== X-Gm-Message-State: AOJu0YzKbDgyiE8HuQbKaDsrloyEZMVEI9+BVFzu+DJIekDkXjHYDdZH fZ2L8zkKkbwiG9KzhxrcMIcsUoe5L4aXfJL7peg05AK7dQUg4d0eSMgSK/Cv X-Google-Smtp-Source: AGHT+IHpkUHEKzI++HDjGzIhsb7S8UUd/t1u9aBw+dCwjLO40N1/1BLoXOBIvyUiQQ38YAjAQ2rrGg== X-Received: by 2002:ac2:530e:0:b0:511:53fa:b971 with SMTP id c14-20020ac2530e000000b0051153fab971mr369128lfh.9.1707852596640; Tue, 13 Feb 2024 11:29:56 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXwzJiJY0zrihVwV1RHZHl4WT2fJ+oBSTmGmgFp1C/V2Vm28vFvrl7aPof+4z0qE8ORW2iA1lv5N8XhYGDG6M1mgNgUae5SBmA66t0T36kmYiMfSiXGY+xD53r120Wk Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:56 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/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