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: 60438 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 5FE7A27BBEA; Fri, 16 Feb 2024 15:14:08 +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 4B89F27BBE2 for ; Fri, 16 Feb 2024 15:14:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raztV-0006de-Vi; Fri, 16 Feb 2024 10:12:54 -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 1raztO-0006bt-Mz for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -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 1raztM-000347-Dj for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raztf-0004Jz-LZ; Fri, 16 Feb 2024 10:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13: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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809633916501 (code B ref 67260); Fri, 16 Feb 2024 15:13:03 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:19 +0000 Received: from localhost ([127.0.0.1]:59901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsw-0004Hy-NT for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:19 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52231) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razso-0004GY-S7 for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:13 -0500 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-41241f64c6bso5851695e9.0 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096245; x=1708701045; 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=ZSNqQOQRnn6YTgsSyE6lZVCRb5MMYZLwT79Ig+wxqCU=; b=U0wtR6mr4chYS0LdEdcT5N6JrwZiJqZKbaTZcOr+eavzprSCS0WD87L1pw6Q4lK6d9 4fYUeyEpWv0Ap14YhHPl7Vw8hO+BPpvEIUcKvAg1vQWsq8FBmSzKc1TWmN0gQHgRZ71S KxMkbxKAcjUkcYptSI0499Ij7VATK5mqKWAoqdNEKzJhTiSQxBEwByqxvhBtdR+l2SHb fDY/u5G7RVVeZ7ABlxIzu1V2//ij+DI1yzxJrhJX3FtOlNFb36voYIVf1ednekBZEIYH p8KS4ItqrjqwEWLlCXbKXM2pVq6gCqgESzWXa6wu3w4gUwTyh0eZzyA336VIf0AlQgfh OaYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096245; x=1708701045; 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=ZSNqQOQRnn6YTgsSyE6lZVCRb5MMYZLwT79Ig+wxqCU=; b=Y3OTyiwDFxYlWE1xtAbPwejJ65dWfTGFZTazL1rjhv0JN2+2Dj8mVecV/wzk8GbmdS NbsELw4WZZ6tyKMq5o+sgQXuwVbFy772FZHgxMfNz4PjD5XTwZjx9nwvBhqKM3R9cW2A wSoA1rD931+c4mJjUNS1e6ZEvvEdC8TznUi95+dck2VRWtGxfarYFnkoMSSqlf6f+vgl JHZLTO6wvAdHQiWtODcSa4oRq+RGDzcB9EjpkQTPhdKlXZT68DppU4Gy25dK8MP+tj54 D2tfF0LjFqOwYeh9M32W4w7u8c/AED+H7ZokxIuIbmWcmKLnyldpsLGgq9aCXQ7ljxsD HoBA== X-Gm-Message-State: AOJu0Yw1geUHvyO3adPjThT5ZNwKoIVK2U5E9P1+z0vv2HBHSAcdq//P 9cIpi8LhSLJHRW7ugqFFN4pfCK9YfoFB7lXVKonPL6f2xvG3572SuHdH7Ov+GDM= X-Google-Smtp-Source: AGHT+IE6Go5hKIkTNZLKtRrB/Jb1rRcZD6o7R4jwRlD1EDp55jJ8wio0sW29keO5w7BvsbbhAWq8VA== X-Received: by 2002:a05:600c:3506:b0:412:1f3f:db1b with SMTP id h6-20020a05600c350600b004121f3fdb1bmr3599288wmq.3.1708096245140; Fri, 16 Feb 2024 07:10:45 -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 o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:44 -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.scm (emacs-minimal)[wrap-emacs-paths]: Also wrap EMACSNATIVELOADPATH. --- gnu/packages/emacs.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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: 60434 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 C516327BBEA; Fri, 16 Feb 2024 15:13: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=-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 4B5F527BBE2 for ; Fri, 16 Feb 2024 15:13:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raztS-0006d8-BN; Fri, 16 Feb 2024 10:12:50 -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 1raztO-0006c0-Sn for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -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 1raztO-00034n-Kx for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1razte-0004Jf-Ls; Fri, 16 Feb 2024 10:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 2/7] gnu: emacs: Build trampolines. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13: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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809633816486 (code B ref 67260); Fri, 16 Feb 2024 15:13:02 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:18 +0000 Received: from localhost ([127.0.0.1]:59897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsv-0004Ho-Ql for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:18 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51383) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsp-0004Ga-2x for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:13 -0500 Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-412393ea2a0so5602755e9.2 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096246; x=1708701046; 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=HNDbZMFI16H14sS2qafFaJNpCO4g4mn8hf8tHDgG5PX7wi8Lf+ZEn65jXQ++gkclun jsz40MKpH6cGu6Vqt+Hyu1uJjcDGlRuGZVVFJsDo/o640Iq2nA7JYR+Q/dDqQy1DZsyJ 19yENpDzoP6oc0hcCVx/mWf2nCSwfyqJ+3dZG0B07EMRe36KhNvRRHRLoRm4iwTqS5ob bh1fyPqmYqrmikBtXIpGeU0OrBkJ3PwR8xh/A5IR5EBKbUvnr4IWNULUDT7JOjkXU2iS 3vBYGOraCmn9Yjoawb1TpQhPSN3jucmy+m8Q4udbTPisDo9zC+crVUrV4qfAmkXlYhf8 Nqaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096246; x=1708701046; 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=BKFHEUn0Qliok0aCdLxPssFB8VFYbZoSj85ig601GDRBz1uqDhPeos5WSnBvb4CzdK btH1wbB6p33D6PKiQIrZfoo7gK2yn4iFAFKttpky2DuuI36pOiEGBIwSKbNe9bYFtPcG qeScR+JXSlbp6sYfgnZrtbGCjQWyHDcGpcKzP5wQfwa/WRZZkccEf9gA3i8VtlilaCf9 BvabFAbnYdq+BRMV76KAfe6xzO65lmSWIh8ys04GbocY5jcvfQHDIXcVinOGr6RXYKrj eOllYT9z1yRCHVT10+GEJ1nIqrgs4Es7MV5OoeR7s4bwX4+5pZNUqcpknN4hheaqVLMr eMdQ== X-Gm-Message-State: AOJu0Yy8l4keIds7CmYgEZ314K3PWQO5HgdjJYDL5XNxreEnoL0EN1A/ /m/4N0q6vFg7q1zRcPvmNQgATmythoEp2A27o0uztFKMxlEsPTrbHEtZm+au+xc= X-Google-Smtp-Source: AGHT+IFDBtugBTV0a10NUvEJ8Tz5LJhGXVUnu3xUhFmRmdj0BX40gaLWsNd+seNOspeYJTrZNCzAXg== X-Received: by 2002:a05:600c:1e08:b0:412:4731:c4f1 with SMTP id ay8-20020a05600c1e0800b004124731c4f1mr1533497wmb.17.1708096245790; Fri, 16 Feb 2024 07:10:45 -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 o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:45 -0800 (PST) Message-ID: <4fe9c932cc5f7d959df5cbc801dfe43f7f817385.1708096198.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: 60433 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 79C6D27BBE2; Fri, 16 Feb 2024 15:13:08 +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 31E3327BBEA for ; Fri, 16 Feb 2024 15:13:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raztS-0006d5-B5; Fri, 16 Feb 2024 10:12:50 -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 1raztO-0006bv-NY for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -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 1raztM-00034F-UT for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raztg-0004K7-7H; Fri, 16 Feb 2024 10:13:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 3/7] gnu: emacs: Don't hash file names in native compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13: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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809634016509 (code B ref 67260); Fri, 16 Feb 2024 15:13:04 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:20 +0000 Received: from localhost ([127.0.0.1]:59903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsx-0004I6-3f for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:20 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:59712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsp-0004Gb-Nc for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:14 -0500 Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-411de7c6b3dso16533055e9.3 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096247; x=1708701047; 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=A/8qKBlzOzzaZflFYGAbZAI9lmTfcbnch3FFeli6MkI=; b=E5SxKdHsU2Z2YsJ/1abmHHjAYKA8Fskm2ve1OP1wHBe+le6B29fziurlt84NJjIXlS b65GX0KhcZ+P+2jKAMexh3E/31q2Q/OgcNRf1YaaOqTip6thcdgwWbGqjY4AZD3g5Wb2 fwjhWiokddRbdK33Xy2lLis7QlRKWSmW/z6t1YUmt8SMEmG3DYGOp4wjg31XkTDZeJ3D eIkOAzT1iuc6sM/OH8A0AI1as53UYRvh4mtWH/bw1/1rjNhiMFwHhZyD9UYXbcWhMzlS 7U8oG7YJF3rfUJgf7RrAmV2vrguQogpGHXFDNS317Ph7PASRrRajaQT0JJoy7z8jeNh8 tmyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096247; x=1708701047; 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=A/8qKBlzOzzaZflFYGAbZAI9lmTfcbnch3FFeli6MkI=; b=YWdCw/2UAvKqOflmBcfuW/ofwapuOFdWIBPCqvkdB9jnrxGhWW6TFRsw6nXJAhu5xj +/PDWBF+4IDA/Tk5VDn1koAOb2x0LWipr2QQtl17Yt4GaVtZxTFfgzjFibmZ1Zi2OHaX HpG+KM4JIjCwXs/3K8O7eoQhBKzWiZUqm93EVyELR1mbNRuP8liyFLc73kzv3Bd67tbK WyHzdSeAzH77iY7G+5WXnqxYgZ6oUkEIr8PF7bw0ijlY/nDcLjMDNMCpyycJgxqQ8aea E4SIurqD7n06h9sfqp35/3i9r31oDd60e1m+7Ys0NuyiQdJWsWrF9Oz+qJ6PhXHYsgBn sV3w== X-Gm-Message-State: AOJu0Yz2F3DnyR16TaFwrJ7nBrBHsQ6lJaVxaAwSLXOkvNTkDxiH4iyE tLoP3WNZzeibGICz9Jjc1ltOo6MQrwCU3mWERJ/CRJSIU1oTQqV2atnKgyYQSU0= X-Google-Smtp-Source: AGHT+IELp/P9uneju0gb1Z1SSJrFtjZ528s52f1HuZsU/ClJ1M4L2FjSo9x2vN82e9giIrHq/KW3UA== X-Received: by 2002:a7b:c850:0:b0:40f:ed18:f74b with SMTP id c16-20020a7bc850000000b0040fed18f74bmr3917453wml.35.1708096246547; Fri, 16 Feb 2024 07:10:46 -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 o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:46 -0800 (PST) Message-ID: <5967a1c96c2437f36922991d2889c39a31e5a74c.1708096198.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 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 329 ++++++++++++++++++ 3 files changed, 331 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..bb6ab312c3 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,329 @@ +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. + +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,71 @@ 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 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; ++ } ++ } + +- /* 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. ++ /* 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); ++ bool preloaded = comp_file_preloaded_p; ++ if (!preloaded && !NILP (lisp_preloaded)) ++ preloaded = ++ !NILP (Fmember (CALL1I (file-name-sans-extension, filename), ++ Fmapcar (intern_c_string ("file-name-sans-extension"), ++ CALL1I (split-string, lisp_preloaded)))); ++ ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); ++ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object 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; ++ } ++ } ++ } + +- '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 (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); + +- 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 (preloaded) ++ filename = concat2 (build_string ("preloaded/"), ++ Ffile_name_nondirectory (filename)); + +- 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 +4492,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 +4533,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 +5843,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/lisp/loadup.el +=================================================================== +--- emacs-29.2.orig/lisp/loadup.el ++++ emacs-29.2/lisp/loadup.el +@@ -53,6 +53,14 @@ + (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) ++ dump-mode ++ (setq ++ native-comp-eln-load-path ++ (cons (expand-file-name "../native-lisp" invocation-directory) ++ native-comp-eln-load-path) ++ comp-file-preloaded-p t)) + + ;; Add subdirectories to the load-path for files that might get + ;; autoloaded when bootstrapping or running Emacs normally. +@@ -557,7 +565,9 @@ lost after dumping"))) + (equal dump-mode "pdump")) + ;; Don't enable this before bootstrap is completed, as the + ;; compiler infrastructure may not be usable yet. +- (setq native-comp-enable-subr-trampolines t)) ++ (setq native-comp-enable-subr-trampolines t ++ ;; We loaded everything we could. ++ comp-file-preloaded-p nil)) + (message "Dumping under the name %s" output) + (condition-case () + (delete-file output) 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: 60432 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 9BB3027BBE9; Fri, 16 Feb 2024 15:13:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 A7A7F27BBE2 for ; Fri, 16 Feb 2024 15:13:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raztX-0006f2-7U; Fri, 16 Feb 2024 10:12:55 -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 1raztO-0006bw-ON for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -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 1raztM-00034G-VG for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raztf-0004Jn-5j; Fri, 16 Feb 2024 10:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 4/7] gnu: emacs: Disable jit compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13: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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809633816493 (code B ref 67260); Fri, 16 Feb 2024 15:13:03 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:18 +0000 Received: from localhost ([127.0.0.1]:59899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsw-0004Hr-5U for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:18 -0500 Received: from mail-lj1-f178.google.com ([209.85.208.178]:49656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsq-0004Gd-EX for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:13 -0500 Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2d11d17dddeso11776961fa.3 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096247; x=1708701047; 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=SeQWVzW6yWPwtZebz2m7ZYWWFHD+CipowjkHoTE6rnPT/L0NWRwhaTOlMpxp/RWBNv 4JwohJW8+ELRCtABHFZo9/dbUGEMGstS+oJOxqn8fpINlGWdwVKDMVfBEpHPtkK8xg+f obB/eJ0XtbewmR+CPqNTQ0dpdGKiwwxPZdHtsg1CBBFTXaAv2ekB7wFhNK70UADdKLq6 4dF7COrgKeMStR2QqzgC3rLU//k4pMIMfs+TRDKqy4PMvWi+5f0vZQDPjlSuN0VxM3CK QMxeyI1mhsDOsRrEK1Bxx4ol5zxAUT3V5HMBWnBi9bhOSCXbdADE1mY5pi9g96ddpD/z 5KpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096247; x=1708701047; 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=qN8NPI5W2RrWLgKhR/YQRnY5rFgURyzrxx07pXpQpw5kztMxFHNZo7oHZ3H6X42OSr Assw52Hf0cpYUAw0iB0YC78hPOpybw1d1uhOYy1QTdXWzF5SMEScq2neiF99WhUCvzH/ obZrfC9P03D8d4IbwOTYArPFvaNGuAilusRhgi/+nR3M0SgN8bcAgWuhWqsfwrHKBYB8 CcnEF2HrXaPU/dsdKFGRpLC/l66/6vew1UkYmP/BPHPHFeOFnZiu0ckOuwTlongP0hpQ kLb+QgrKFVpXZQT0ZaawqAoOI2e15mhs6t4jls1KjMniUiSeirRreRuK0vHxOCXaiKCL 0GBQ== X-Gm-Message-State: AOJu0YzENuI9hCvC0pNzp9tVuxaqM1uNxBnXpGW38eb9QfvDsxxFnmv1 vxARoZiUzFBhPPTmRRcotk+sHqb/gpOaoQ5mXivU5+jvG9MpZ/2iDMYhvAQ+ X-Google-Smtp-Source: AGHT+IFf51Zy78FqMg5rnWczbMB61NLK4YVccQbrw7F4C3IrwAyAewCoWYPceFokXqi8TocM9PGF8Q== X-Received: by 2002:a2e:8290:0:b0:2d2:1fed:8029 with SMTP id y16-20020a2e8290000000b002d21fed8029mr436425ljg.28.1708096247182; Fri, 16 Feb 2024 07:10:47 -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 o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:46 -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/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: 60436 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 F258627BBE2; Fri, 16 Feb 2024 15:13:47 +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 A088B27BBEA for ; Fri, 16 Feb 2024 15:13:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raztT-0006dH-OQ; Fri, 16 Feb 2024 10:12:51 -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 1raztO-0006bs-NA for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -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 1raztO-00034S-8r for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1razth-0004KY-GZ; Fri, 16 Feb 2024 10:13:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 5/7] build-system: emacs: Compute relative file names. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13: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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809634116530 (code B ref 67260); Fri, 16 Feb 2024 15:13:05 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:21 +0000 Received: from localhost ([127.0.0.1]:59909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsy-0004IS-VA for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:21 -0500 Received: from mail-lj1-f179.google.com ([209.85.208.179]:51401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsr-0004Gf-5V for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:15 -0500 Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2d208be133bso10654861fa.2 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096248; x=1708701048; 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=LWST5FQpULf+cfZqQ5GLHs1cStFPxlEPHwk3ZIuo9jbJKI+EFhFlrvQfwFnLikAXXP Jzuz3fM/sXzNK7iuK7jp387YaFctCBYl+qZ+4AiQobnCHDuBV07Hlchaar8K4yxV0SVh 0IAbjhMrp3oiXOMZffVU0cF1r9dYUGJu+WwUnTtdB3ZYgA/qJhLqMCC4SgHSbxqM6tY8 KY1d2LEFZhKWHjjTBen3Sie/IpuUXlf9jsWoprRolvx/SXv5wun9PbCR/AIMMzC0BQRA IIbDp99lSliGgPLoyHxX2IPNod6b+TDWtJydHwlmjoee2wlZEYBo3BiNojkJTgTH+LS5 gmDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096248; x=1708701048; 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=qorVSeXrBuUKQSDjHj2ZT3X1gXTti8NHNyLnjhf7dgilJUHQ5+qLEMLJ4096lFtv7P wWyn9gsgV9qWkf67RDmtGzB/DfFl0ETMj3IONRQEf/MfhkcdNcJz0hdeVBpwnApMZIAO 8PCBSlipMQ25rvyVLNttH0bKEextcEAQ8lffxklffbSqKzvsFky/tvxiSipPV9T551Ym xPZDqZ8AZnxePur0AskGAwG27irJBsSge+J9uhSucgR/Swn3TX7cExwnDwKVKYoFGuds m8uJtpCyAVRew0JmIISnVmpj49KZcspFPwnRyrtd6GBdTYJKhTOt234FJ2X1rrbGeAn9 95jg== X-Gm-Message-State: AOJu0YyugbG+54kALu1oPoQ6Lh+/NRKNv/pbdhzchB6Q9y1XppqYgzOD P40KI1q/WQkJRjMmZ4X9SVmNKxprQSIzzkt3ccNRDfapuqi096R4UTez5T1C X-Google-Smtp-Source: AGHT+IGqlvuc/ODoKMRAAjhSQxEL9X6NfL0r4hj9jjgsur7lj5UK+8DqXOgLDlCxbBdHQoVOZjA4MQ== X-Received: by 2002:a05:651c:2107:b0:2d2:1968:bea2 with SMTP id a7-20020a05651c210700b002d21968bea2mr1941342ljq.24.1708096247834; Fri, 16 Feb 2024 07:10:47 -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 o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:47 -0800 (PST) Message-ID: <583c5ca9ccdc597fb9e1be59ed86193299d68715.1708096198.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: 60437 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 07C9927BBE2; Fri, 16 Feb 2024 15:14:00 +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 8786127BBE9 for ; Fri, 16 Feb 2024 15:13:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1razta-0006hx-5z; Fri, 16 Feb 2024 10:12: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 1raztU-0006dn-FF for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:53 -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 1raztU-00036h-6x for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raztg-0004KH-Lm; Fri, 16 Feb 2024 10:13:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 6/7] gnu: emacs-org: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13: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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809634016516 (code B ref 67260); Fri, 16 Feb 2024 15:13:04 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:20 +0000 Received: from localhost ([127.0.0.1]:59905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsy-0004IE-9P for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:20 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:43144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsr-0004Gg-FH for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:14 -0500 Received: by mail-wm1-f67.google.com with SMTP id 5b1f17b1804b1-40fd2f7ef55so18523975e9.0 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096248; x=1708701048; 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=GTUztkM09LCWEEPX/wQytugIR0NiN9u+299x3ikxWqSAIwh5TH7uqq3q6OQxt4qXjU jjREBcCCxyCgx3Vnq1GGPY7dfLO/wWdqboK6BbK/yB7ZJSGSm6mAeVPKuN3ZTWdBkLCg jlfIy3nY5UT8PyZCEY8gWzxKBwU0zrC1xKRrLfEhgJ+hPtiq1dveK63hHeCAXVScctVv xMoVi4INvs41M437z1vSariGOaeZHG5yuhf8lvRlyv9aph3iuR6MyH1dfMb2a5v3qEqy TKHZaFGSnCtu+1HvFFYse8w3/D9n368jBpHaruFPl0wa3DqZNZausH/AG8gKTYtSKqST qMbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096248; x=1708701048; 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=QuSmtRMAqB8pHGqQT1WD62LqDbHe0Og/kSfGculZYvPALZXynB+jwtt3+OUNpY3Cgn zEbF6DdoUCqdcnKHWPvv7pEvuXvdHkZqjm3vi8295pB9+klWGrbQoQcp0uWezbBBhN7X vUTJz6843kHY+bicyKP4JNI64b0JXcniydfvgdzIKuBSI0xmPUJblXNn2fANy7bBeqx8 Cxijh7pzNKq2vHKvpNeL9NDYafOcBpw7Kv3pd6uw16ycW7DVE3xODxXs7uNCN8hITgcK 8X+i/HOko2YY5ERJhf3GI7tr30ljSQTCgd0HgxnCms/FZ2b68CvQ0rE9vCo6pnf6r/a7 0jAg== X-Gm-Message-State: AOJu0Ywt90+hrz1X8EEG5hbaS2q4jUUQMJnk8ratDBYapgGpzI+Tx9NM mHRgsTcFdxSkvizEiwg6vb9pek9NYayqs6EpvtA3yYYayUH6MgU2Wr3w19kbu90= X-Google-Smtp-Source: AGHT+IGgIsbbiJHnS91apavHQ4lc1OLShnBaRu8RlNtkXwlMUZJs7VGdeuZSjh12HDhzE84lJNRkHA== X-Received: by 2002:a05:600c:4f12:b0:412:52a3:406f with SMTP id l18-20020a05600c4f1200b0041252a3406fmr1279257wmq.12.1708096248471; Fri, 16 Feb 2024 07:10:48 -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 o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:48 -0800 (PST) Message-ID: <04e0fd37245f7e6bff11de512e901792a27ff1bc.1708096198.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: 60435 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 157A827BBEC; Fri, 16 Feb 2024 15:13:47 +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 9A2E427BBE2 for ; Fri, 16 Feb 2024 15:13:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raztT-0006dI-Oo; Fri, 16 Feb 2024 10:12:51 -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 1raztO-0006bu-NF for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -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 1raztN-00034K-Pj for guix-patches@gnu.org; Fri, 16 Feb 2024 10:12:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1razth-0004KQ-1q; Fri, 16 Feb 2024 10:13:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v10 7/7] gnu: emacs-magit: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Feb 2024 15:13: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: Suhail , andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170809634116523 (code B ref 67260); Fri, 16 Feb 2024 15:13:05 +0000 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:21 +0000 Received: from localhost ([127.0.0.1]:59907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsy-0004IL-Kp for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:20 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:58714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razss-0004Gh-05 for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:15 -0500 Received: by mail-wm1-f67.google.com with SMTP id 5b1f17b1804b1-411d231ea71so16608545e9.1 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708096249; x=1708701049; 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=KHH4TLDu7ubq5Ncxa5of8Q3s/V2CkOx+uXTLsu44V6krhFrd4lV/sNqkJ5HtxMVVW+ 9+WfvBNZpMunVJVNQ68eFH90/gBUqcSJa1QWJ0RKyqTblT2x8rWNtHFDarIdwe8vKNz0 dv82s+DmWYj8MGcyVVEpfCI7g+VCDRkN6+5cXg6g0UBNJ0QAzySR0DOITPWLRYl9yGHj ke2M/HfrP5ZfJWULWQe7aGZZutR8hWnCrRfc5njyYaSJ+v9mUzYmWy3LVX4C3vz0Wsh2 j9q1X05FXG7eIe0o27srkV66wCD/xqTpibJ3ei+xxW+rV/Zy5Y3/FFSHn39N9aVrLZhc U46w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096249; x=1708701049; 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=lLfr76eAk579gB3ygJPKW0u4kzXw8gNYDxHguNwznOZwLaBqP67xeT6sXGSoCS1kxr bvboTEPyzx3wpo4rCO7ywDw9K8/MN6dZJiErdSq7wK8NbSyTRmsQbwO15pj+t5uWUyaT OucNcJgDEkgtw22R4QlA1tACD11GfSyEj32G2b5Kpgqql4ltQdF97uUNV6NsbkrP2Tqn 6QyimC3OmNduxz20Qp0D45ihaycPwxmsWnSWIkE/U0yche1kdE6goYieQ6dJUi63lH9C 1b4YBcXDEwmgkHzrxkEQXU6JqHwbMk74k8WNeIYpY16NBNtP8WsM+5uU4xZSPlpzHx9e 3t8g== X-Gm-Message-State: AOJu0YyXZ7VZhGduZSH0e7HRwvVM/jyLoP0J016w5RfSmCsJc2PehiKB V/CANodq0XKq7biMIe2l9PL+gZ3IsDQMx1+7+SCRE/QtEB786tzaymxhskSx/u4= X-Google-Smtp-Source: AGHT+IFHcTksh1PB+Aq51QgUsGj3XN9xOfqrmImtizumJDJ7Zmpt274xQ92JkdXPP00fLXi+zcVQ+A== X-Received: by 2002:a05:600c:4fc2:b0:411:d8f1:8c12 with SMTP id o2-20020a05600c4fc200b00411d8f18c12mr3974846wmq.26.1708096249124; Fri, 16 Feb 2024 07:10:49 -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 o21-20020a05600c4fd500b00410ab50f70fsm2596052wmq.15.2024.02.16.07.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:48 -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