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: 60963 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 5BA8D27BBE9; Sat, 24 Feb 2024 08:23: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, 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 E1D4F27BBE2 for ; Sat, 24 Feb 2024 08:23:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnJs-00046u-3y; Sat, 24 Feb 2024 03:23:40 -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 1rdnJq-00046g-Kp for guix-patches@gnu.org; Sat, 24 Feb 2024 03:23:38 -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 1rdnJq-00067r-Cz for guix-patches@gnu.org; Sat, 24 Feb 2024 03:23:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnKD-0006PU-SE; Sat, 24 Feb 2024 03:24:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v11 1/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: Sat, 24 Feb 2024 08:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: 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.170876298624449 (code B ref 67260); Sat, 24 Feb 2024 08:24:01 +0000 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:23:06 +0000 Received: from localhost ([127.0.0.1]:37528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnJJ-0006MG-Tq for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:23:06 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:43094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnJH-0006LC-Sh for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:23:04 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a3ddc13bbb3so183285866b.0 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:22:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708762894; x=1709367694; 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=MzfPIititJ0WSItE1t3barFyKqPVLzG3h5UGGFlqqsM=; b=MGzZGhavXkNWE9LfP+TmODgvFpjnJxzu7Dq6EFjDIUInO6tlj443LAfPkPzHlANnsK Pa9df3fSElvOf/qAMebL7+adBGLATDJdwbITqHFHPNQ70SugTcVTKDCW8lGgl+oKFikZ oA6yu7GRnDwyktef2ZScJD6grdP602IWNlTGosjcsuNbtcCe6AH0o5d5W1kijBSR//Ce FBsprqEvJY76a4IUKaXYQgJjVwnFAlK2P6MjWLkLZQi2Bh62rrgr+NEK/aHvLkjxwysr jZ7Ln5KKXzFnU0NO/jtSl1PA7v8lNC0HlVI2K1UpLCV1ZwKiDTxWKVYcHSbokLR77AYu B1GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708762894; x=1709367694; 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=MzfPIititJ0WSItE1t3barFyKqPVLzG3h5UGGFlqqsM=; b=v668ZR3kKtCtu6jRoZQ2kyeHVdMPDKsqi0UjNesPhEADDDLzBEcTLJKgxI54UAkwV4 erauc18I82q4eBlfvWK0ZZtX3uOMj8IsVfraHKY+X1aUeV5hgFBEeTi+8xKOpcc/JZEW Ukohchz344s530UZPOC/vV+q2/lRD9vI1gp+krwAWSSfPrmEEfmFMWMWdMv/N/lZW/O7 H4T9udGtZT3zxlRjnC2FtzLEMOWyaCA74PLJNtxFwBPnocs7+bgRULRT4MyB7mza8LMs AFvMRiGCjMfwOjAXEQglNEybapa9NyN7eOY7JLCUbRu5xV0nb3PGWItIoDah49+SbvXH Jkuw== X-Gm-Message-State: AOJu0Yza0Ej7d+Ox62lbUALkr1ZO531l6xrC+ZGX1F1ossh3sHYmn5d/ pD7HxTHMp96QlwpNmiYfZTvRLRJp8IYcaEQbOgbUwHyaMQBQOc+AYyjLFdJMUcE= X-Google-Smtp-Source: AGHT+IGnAd7iQzIy5kx9pjakKlmr3NdeiyhVa1xMrQd1sYhfOZnvLwGBWwRpLmqHLDvPaU8p+2NCDg== X-Received: by 2002:a17:907:1de0:b0:a3e:5ebf:345c with SMTP id og32-20020a1709071de000b00a3e5ebf345cmr1590597ejc.21.1708762436322; Sat, 24 Feb 2024 00:13:56 -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 fk2-20020a056402398200b00565aed6c2a8sm160945edb.29.2024.02.24.00.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:13:56 -0800 (PST) Message-ID: <833ccf20a947e44b0eac3cefdaa185f0eb05b027.1708761863.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 5f27c551e0..e4119ec21d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -376,7 +376,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: 60961 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 56C2627BBE9; Sat, 24 Feb 2024 08:22:58 +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,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 D91A127BBE2 for ; Sat, 24 Feb 2024 08:22:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnIv-0003vm-QY; Sat, 24 Feb 2024 03:22:41 -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 1rdnIs-0003vA-P0 for guix-patches@gnu.org; Sat, 24 Feb 2024 03:22:38 -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 1rdnIs-0005wt-GC for guix-patches@gnu.org; Sat, 24 Feb 2024 03:22:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnJG-0006Le-Eq; Sat, 24 Feb 2024 03:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v11 2/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: Sat, 24 Feb 2024 08:23: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.170876295124295 (code B ref 67260); Sat, 24 Feb 2024 08:23:02 +0000 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:22:31 +0000 Received: from localhost ([127.0.0.1]:37468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnIj-0006Jh-Fj for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:22:30 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:56691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnIe-0006Iu-Mz for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:22:26 -0500 Received: by mail-lj1-f195.google.com with SMTP id 38308e7fff4ca-2d27184197cso13749501fa.1 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708762855; x=1709367655; 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=IkFbV3cjuICH1kqLAPtp1owygyMQtBZkEoRBcMS99q4=; b=C8EbT5C6ceqrW3k3lgkCTTbzGMG0Fdj2CxkwyJXduZDVLGMMr15koiqcNv+hh/wm4R 42Pz5W6t/0doyBZlQMbbO5kuGFQr3qYv4TPICVXAFts5Bru0L4ijz/sIgvI5/EBpoYkl u1V1aP5YMJr6NKlueaGb8oOyV0AQHalfNB/Ee6XfrLDUTYqYehCBNbj6UD9ZvXdSH6/r cPuyUBCYplSxj3E+a+QRPAHKRtGfXKdkfciSf6NyaYKx8nXUQnmJpsQoYIPk0abGhn7E JSWS+CyCrpBxmQZaPSDVYyWBQCKcSs94unVhtZgR5DML2ml69SLIIqoCw8YBhntTjK85 uAxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708762855; x=1709367655; 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=IkFbV3cjuICH1kqLAPtp1owygyMQtBZkEoRBcMS99q4=; b=SyYqggzFqdtLQ5q3jLe3x3rpD9AlAvM2OmnEqdH9f4605CC8Louzn6brsg7peAOEwC 9/9+tzz8hSauR8UZSDjrtqylPdoJ8YP9zQxAIPJPAr2znIu+7BNL0JzqmMdlq6D+qn20 zlHIaglfCRKVi0YiKdPVYwgknr2Vr7KObTvfik8wmUlmN5TI/O127S4AMLk3dBLQZN8H rEqgHTw9pTNiP3E94sAZpBsZBZ1bQUaKPrjndjMivDWDK6wkpX4d6gApEt6/6of2AXvm uog03Q+C0pLVuUrLlbFEjypUDbQ1PdKqJQ8QWooM0sOgktrI7yFjAWhZaEHAp99Iekvw Ay/A== X-Gm-Message-State: AOJu0YzivF5m35UvYJkDOgN5HAlNDWBk/AnS6WtkI7Q5dZgDuJ2ZQFQS TX5iTbYLx1cNBaqaGLww1AoUdNhOXfUUbNqWGR4XfPBXQSik7DlHD4mH2P3h7xU= X-Google-Smtp-Source: AGHT+IFKnlfWheSSVafydKWUxQqeb2RFU9CSyHrwq70JWz+UcYGj2Qn1p+ZBw4P2jkgMnFYlYn425g== X-Received: by 2002:a05:6402:b37:b0:564:ced5:7908 with SMTP id bo23-20020a0564020b3700b00564ced57908mr1132622edb.9.1708762437157; Sat, 24 Feb 2024 00:13:57 -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 fk2-20020a056402398200b00565aed6c2a8sm160945edb.29.2024.02.24.00.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:13: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/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 | 338 ++++++++++++++++++ 3 files changed, 340 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 e4119ec21d..182de0204d 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..169323f290 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,338 @@ +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,55 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); +- +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); +- +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation +- +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. +- +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ +- +- if (NILP (loadsearch_re_list)) +- { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) ++ FOR_EACH_TAIL_SAFE (tail) + { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) ++ 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 = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); ++ filename = Fsubstring (filename, len, Qnil); + break; + } + } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ ++ if (file_name_absolute_p (filename)) /* no match in load-path */ ++ filename = rel_name; ++ ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); ++ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object 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 (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4476,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; +@@ -4548,10 +4524,11 @@ the latter is supposed to be used by the + Lisp_Object lisp_preloaded = + Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); ++ bool preloaded = comp_file_preloaded_p; + if (comp_file_preloaded_p + || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), ++ && !NILP (Fmember (CALL1I (file-name-sans-extension, source_filename), ++ Fmapcar (intern_c_string ("file-name-sans-extension"), + CALL1I (split-string, lisp_preloaded)))))) + base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + +@@ -5863,10 +5840,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. +@@ -494,22 +502,20 @@ lost after dumping"))) + (concat eln-dest-dir "native-lisp/" comp-native-version-dir "/")) + (maphash (lambda (_ cu) + (let* ((file (native-comp-unit-file cu)) +- (preloaded (equal (substring (file-name-directory file) +- -10 -1) +- "preloaded")) +- (eln-dest-dir-eff (if preloaded +- (expand-file-name "preloaded" +- eln-dest-dir) +- eln-dest-dir))) ++ (native-lisp-needle ++ (regexp-quote (concat "native-lisp/" ++ comp-native-version-dir "/")))) + (native-comp-unit-set-file + cu + (cons + ;; Relative filename from the installed binary. +- (file-relative-name (expand-file-name +- (file-name-nondirectory +- file) +- eln-dest-dir-eff) +- bin-dest-dir) ++ (file-relative-name ++ (expand-file-name ++ (save-match-data ++ (string-match native-lisp-needle file) ++ (substring file (match-end 0))) ++ eln-dest-dir) ++ bin-dest-dir) + ;; Relative filename from the built uninstalled binary. + (file-relative-name file invocation-directory))))) + comp-loaded-comp-units-h))) +@@ -557,7 +563,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) +Index: emacs-29.2/src/Makefile.in +=================================================================== +--- emacs-29.2.orig/src/Makefile.in ++++ emacs-29.2/src/Makefile.in +@@ -553,6 +553,7 @@ shortlisp := $(filter-out ${shortlisp_fi + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS = + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. From patchwork Sat Feb 24 06:18:52 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: 60959 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 5474E27BBEA; Sat, 24 Feb 2024 08:15:51 +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, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CA25327BBE9 for ; Sat, 24 Feb 2024 08:15:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnC9-0002OF-V2; Sat, 24 Feb 2024 03:15:41 -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 1rdnC8-0002NX-LF for guix-patches@gnu.org; Sat, 24 Feb 2024 03:15:40 -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 1rdnC8-0004yN-Dc for guix-patches@gnu.org; Sat, 24 Feb 2024 03:15:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnCT-0005yw-Mr; Sat, 24 Feb 2024 03:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v11 3/7] gnu: emacs: Check integrity of native-compiled files. 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: Sat, 24 Feb 2024 08:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: 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.170876253122904 (code B ref 67260); Sat, 24 Feb 2024 08:16:01 +0000 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:15:31 +0000 Received: from localhost ([127.0.0.1]:36934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnBy-0005xC-Jm for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:15:31 -0500 Received: from mail-lf1-f53.google.com ([209.85.167.53]:59816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnBw-0005wo-D7 for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:15:29 -0500 Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-512bb2ed1f7so1448000e87.3 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708762438; x=1709367238; 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=kCcZhNvi2kr7UPM68gWZP09wXI0LF0GQvbLryvANNnw=; b=Uk8QW5FN4gzt25azxHcP8q4gTWBu3ERrQv0+B27w6l12Bqhh8X7uMuCItoGOW0Z3uH C/ZL0LjFSIaDUvp9k1veQbciRL6CBbHgxCZIuzbhKLCev1KruO8joIonlKCxR8vJ9Tv9 ZABum8bTRwroP6DVImakwbhsVut5jbZQ0gGLpKOs2QitmV3lacdJKcUpZhHptV9Zee4Z EyHKG2OaFbBXC2fO4I9O3veXsTOcd199plQlwplzgnyGA2nRKnv3S3ObF33ZnvWQkcPa le6rDyu8vHAZbkqbgY/uxpCI/SFyFru+jFJgUq9NE2wu6rW0cK7qFID9mKriiuVmkzQu 6Umg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708762438; x=1709367238; 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=kCcZhNvi2kr7UPM68gWZP09wXI0LF0GQvbLryvANNnw=; b=rKf1KWh6VWE4rqFmLocbbu8Zh3ObrGgf4LpISpifCN9JuvCpynThGaJgSdQDsMuzTQ 5tTObHRXuKmvmqziIVOP8QjwOnRGdS+Hf08T3yA6X84GQPbfzfjid/53vZAKe7UHTM+j hOC+/nV+NkgD5ILbevRKY1DieE9XpyKwv5QClqlUWytpPhXODi8ekZMTRnSKwGVuZm74 5JmH8byis5S0Kuchod0IYIemfguXQkotVoUuGke4vXQe2mQh/SIAqYnTH0E3gZXjmZV2 XOWS9eZ15UEYsQBM319e8VvScZlongN1flNsSU+usnntDC1rQcogn0ukUpv03uprtWQA thRg== X-Gm-Message-State: AOJu0YydoLrYAEEDwuX++lG/9+X15Se1jQ/irn5+J9Km2OLeJzi1VpBX FFOw5SqnJ6HLJPFpSx6fJZN+9rv+Vl8KdOKvbqHyr9cGhYtDhtznfM5KcFrn X-Google-Smtp-Source: AGHT+IHCX+ONVXTB1GZ3MXl+g+WZGBCR3ll1wnOzQpb2bnPATxSBppWBH6HKqYGQM2kUwoa5smWqJQ== X-Received: by 2002:ac2:4256:0:b0:512:9d0e:2ca5 with SMTP id m22-20020ac24256000000b005129d0e2ca5mr1027732lfl.39.1708762437972; Sat, 24 Feb 2024 00:13:57 -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 fk2-20020a056402398200b00565aed6c2a8sm160945edb.29.2024.02.24.00.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:13:57 -0800 (PST) Message-ID: <35fc3027f372eddbd21a2c6b5a591453591a6825.1708761863.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 24 Feb 2024 07:18:52 +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 In the previous commit, we've added a patch that potentially messes with how built-in (especially preloaded) Lisp libraries are loaded. Thus, we might want to assert that these files still load fine, as reported when querying the builtin documentation of functions provided by them. * gnu/packages/aux-files/emacs/comp-integrity.el: New file. * gnu/Makefile.am (dist_noinst_DATA): Register it here. * gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add ‘validate-comp-integrity’. --- Makefile.am | 1 + .../aux-files/emacs/comp-integrity.el | 126 ++++++++++++++++++ gnu/packages/emacs.scm | 13 +- 3 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/aux-files/emacs/comp-integrity.el diff --git a/Makefile.am b/Makefile.am index d3b9532c7a..6837c4c87c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -421,6 +421,7 @@ dist_noinst_DATA = \ # Auxiliary files for packages. AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ + gnu/packages/aux-files/emacs/comp-integrity.el \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/findclass.php \ gnu/packages/aux-files/guix.vim \ diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/packages/aux-files/emacs/comp-integrity.el new file mode 100644 index 0000000000..ed6a348fed --- /dev/null +++ b/gnu/packages/aux-files/emacs/comp-integrity.el @@ -0,0 +1,126 @@ +(require 'ert) + +(eval-when-compile + (require 'help-fns) + + (defmacro expect-help (fun result &optional feature) + `(progn + (eval-when-compile (when ',feature + (require ',feature))) + + (ert-deftest ,(intern (concat "expect-" (symbol-name fun) + "-" (symbol-name result))) + () + (should + (eq ',result + (let ((desc (substring-no-properties + (with-output-to-string + (help-fns-function-description-header ',fun))))) + (cond ((string-search "native-compiled" desc) 'native) + ((string-search "byte-compiled" desc) 'byte) + ((string-search "built-in" desc) 'built-in) + (t nil)))))))) + + (defmacro expect-native (fun &optional feature) + `(progn (expect-help ,fun native ,feature))) + + (defmacro expect-builtin (fun &optional feature) + `(progn (expect-help ,fun built-in ,feature)))) + +(expect-native abbrev-mode) +(expect-native backquote-process) +(expect-native mode-line-widen) +(expect-native buffer-menu) +(expect-native button-mode) +(expect-native byte-run-strip-symbol-positions) +(expect-native case-table-get-table) +(expect-native cconv-convert) +(expect-native use-default-char-width-table) +(expect-native cl-generic-p) +(expect-native cl-struct-define) +(expect-native x-setup-function-keys) +(expect-native encode-composition-rule) +(expect-native custom-declare-face) +(expect-native minibuffer-prompt-properties--setter) +(expect-native custom-add-choice) +(expect-native debug-early) +(expect-native display-table-slot disp-table) +(expect-native dnd-open-file) +(expect-native dos-mode25 dos-fns) +(expect-native find-file-text dos-w32) +(expect-native dynamic-setting-handle-config-changed-event) +(expect-native easy-menu-item-present-p) +(expect-native eldoc-mode) +(expect-native electric-indent-mode) +(expect-native elisp-mode-syntax-propertize) +(expect-native getenv) +(expect-native epa-file-find-file-hook) +(expect-native face-list) +(expect-native find-file-noselect) +(expect-native fill-region) +(expect-native font-lock-change-mode) +(expect-native font-lock-add-keywords) +(expect-native fontset-plain-name) +(expect-native format-read) +(expect-native frame-edges) +(expect-native fringe-mode) +(expect-native help-quick) +(expect-native image-type) +(expect-native indent-region) +(expect-native indian-compose-regexp) +(expect-native msdos-setup-keyboard term/internal) +(expect-native isearch-abort) +(expect-native iso-transl-set-language) +(expect-native jit-lock-mode) +(expect-native jka-compr-build-file-regexp) +(expect-native keymap-global-set) +(expect-native forward-sexp) +(expect-native lisp-string-in-doc-position-p) +(expect-native ls-lisp-set-options ls-lisp) +(expect-native macroexp-compiling-p) +(expect-native map-y-or-n-p) +(expect-native menu-find-file-existing) +(expect-native completion-boundaries) +(expect-native egyptian-shape-grouping) +(expect-native mouse-double-click-time) +(expect-native convert-define-charset-argument) +(expect-native coding-system-change-eol-conversion) +(expect-native store-substring mule-util) +(expect-native mouse-wheel-change-button) +(expect-native advice-function-mapc) +(expect-native comment-string-strip) +(expect-native obarray-make) +(expect-native oclosure-type) +(expect-native forward-page) +(expect-native sentence-end) +(expect-native show-paren-function) +(expect-native pgtk-dnd-init-frame pgtk-dnd) +(expect-native prog-context-menu) +(expect-native regexp-opt) +(expect-native get-register) +(expect-native query-replace-descr) +(expect-native rfn-eshadow-setup-minibuffer) +(expect-native read-multiple-choice) +(expect-native scroll-bar-scale) +(expect-native gui-select-text) +(expect-native seq-first) +(expect-native hack-read-symbol-shorthands) +(expect-native next-error-find-buffer) +(expect-native exit-splash-screen) +(expect-native buffer-local-boundp) +(expect-native syntax-propertize-multiline) +(expect-native tab-bar-mode) +(expect-native tabulated-list-put-tag) +(expect-native text-mode) +(expect-native timer-activate) +(expect-native tool-bar-mode) +(expect-native tooltip-mode) +(expect-native tty-color-desc) +(expect-native ucs-normalize-hfs-nfd-comp-p ucs-normalize) +(expect-native uniquify-item-p) +(expect-native vc-mode) +(expect-native emacs-version) +(expect-native define-widget) +(expect-native window-right) +(expect-native x-dnd-init-frame) +(expect-native x-handle-no-bitmap-icon) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 182de0204d..f0200ad27c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -380,7 +380,18 @@ (define-public emacs-no-x "-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))))))) + (apply invoke "make" "trampolines" make-flags))) + (add-after 'validate-runpath 'validate-comp-integrity + (lambda* (#:key outputs #:allow-other-keys) + (if #$(%current-target-system) + (display "Cannot validate native-comp on cross builds.\n") + (invoke + (string-append (assoc-ref outputs "out") "/bin/emacs") + "--batch" + "--load" + #$(local-file + (search-auxiliary-file "emacs/comp-integrity.el")) + "-f" "ert-run-tests-batch-and-exit")))))))) (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: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 60964 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 09E1327BBEC; Sat, 24 Feb 2024 08:25:01 +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, 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 2162127BBE2 for ; Sat, 24 Feb 2024 08:24:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnKq-0004Ga-6w; Sat, 24 Feb 2024 03:24:40 -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 1rdnKp-0004GF-1U for guix-patches@gnu.org; Sat, 24 Feb 2024 03:24:39 -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 1rdnKo-0006CN-Q6 for guix-patches@gnu.org; Sat, 24 Feb 2024 03:24:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnLC-0006Tv-NF; Sat, 24 Feb 2024 03:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v11 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: Sat, 24 Feb 2024 08:25: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.170876305624734 (code B ref 67260); Sat, 24 Feb 2024 08:25:02 +0000 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:24:16 +0000 Received: from localhost ([127.0.0.1]:37642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnKS-0006Qq-0d for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:24:16 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:58690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnKQ-0006QE-3A for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:24:14 -0500 Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-4129ed6f514so511185e9.1 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:23:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708762964; x=1709367764; 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=MpYEa4qcmPwoOR3kFnr77cpFNyyFz45jgeYOJ5EioKM=; b=Tr8jc1ZhUeWdZDP7tHkCToa5btxAaHEnhvjDTCTpMXGnXPDbiN3MlhZKg9tga2LZmn j2qshmz8HI1rwR+1HfwfrEtiroLsZlKSe8Ty3QtmTeT7gBYe5IKA1qAW8o7SYVUl6uny QKRbMUkgqJ8TN+sh8YKR9T6e9Z0q/rlL5BwvWhqUHy86n1NJhC3bGd0ao0VijDNjw46d NDRCo40YjTofQaK9nuof0FPSPeEPg43n7ryP7KseM41M9R/gEB+RokaPgAQ8oGIpNHjr RbwuNJcrBProZG1oILQeN2/T03wdf4WvDrQpe8pgpk60TWYPSILI0Rgw2xj7ToQZFnr7 FmJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708762964; x=1709367764; 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=MpYEa4qcmPwoOR3kFnr77cpFNyyFz45jgeYOJ5EioKM=; b=EdKOOS6FMt1tIwXs6320ALsJ3jZ+K/f8GVA6pamZizW5q+m1x+bQX50v3NaruwfSZD 1nXcrsfctyQL1y44SxIuLces4VeElEatakwnvdMJ3PK8Osboe3QxaCRF+tQec8FeudpW Bq06nC98Q5QcLSdppRTQeGYyVh2y5BU8aAtzblMm/B+5laR1cyS0Dxeam+ytxTWc1Kqi X961a+TsFU9jrBZjnBHzNiAOVK1SozV9adQoa3SLGP88P43pDkgH5vAjsqLKy29xSvPd 11cxWgQ2eHGPG0EM4/XXjd+ZvPDT99y8So8MFWJ4EtcVF7BvlN+89auJ77YoCOUbHLZA +TKw== X-Gm-Message-State: AOJu0YymvEQgKWZxnLdXcZyl1SErFuLlKNmgJ0/S8dCyqLd4Bji9kFo0 rvNa+DrL7JKJs9CUVriYLLuA1BYV3ht0NYmW/PEkbGES/LRav9K3lj65+OS1VyQ= X-Google-Smtp-Source: AGHT+IEasNkpAt8WPKjqKH4niyZrrKdzseqXs/3TawtvznpK+LS3TCF1RbtmVN2tt8MnmCf42lcCkg== X-Received: by 2002:a05:6402:895:b0:564:813f:7af3 with SMTP id e21-20020a056402089500b00564813f7af3mr1146636edy.18.1708762438667; Sat, 24 Feb 2024 00:13:58 -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 fk2-20020a056402398200b00565aed6c2a8sm160945edb.29.2024.02.24.00.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:13:58 -0800 (PST) Message-ID: <3621493e4cc9f83253d7f191b783fd11212c7045.1708761863.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 f0200ad27c..e6f2b699ac 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: 60968 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 8C8B927BBE9; Sat, 24 Feb 2024 08:41:24 +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, 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 79A5127BBE2 for ; Sat, 24 Feb 2024 08:41:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnaN-0007UJ-Tv; Sat, 24 Feb 2024 03:40:43 -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 1rdnaM-0007T8-Ih for guix-patches@gnu.org; Sat, 24 Feb 2024 03:40:42 -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 1rdnaM-0000cg-Ae for guix-patches@gnu.org; Sat, 24 Feb 2024 03:40:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnah-0001go-Ul; Sat, 24 Feb 2024 03:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v11 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: Sat, 24 Feb 2024 08:41: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.17087640276286 (code B ref 67260); Sat, 24 Feb 2024 08:41:03 +0000 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:40:27 +0000 Received: from localhost ([127.0.0.1]:39043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdna6-0001dF-Qb for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:40:27 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:54620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdna3-0001cc-3e for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:40:24 -0500 Received: by mail-wr1-f68.google.com with SMTP id ffacd0b85a97d-33d066f8239so965667f8f.1 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:39:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708763933; x=1709368733; 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=fMETDSxXib6b8CWP+OKAjjoAOBDLmIJhOwH2PlLCWD/IRTkmJksJuklJkChdE/VEK6 jtzzR6s/6YaLr7o+ZWawiiIgQHu0z3QqpcAXyY543VpGlUMKOAouYXvUPGZo2N1kszV2 +ltF2lmwwAl6QKjR7JTNzecwTVlwu+LrGxzG0auVTH2iHZPav+/ESzpv67dDFDK6BOqb kpt7LzHviv4L3LZmJ9DFEZOgXtH9MIVm8LF9EMogHGHtcYngNuvnLWBYioyuQUc/RcMU MeaVSzL+CigTj6tJ+LZb35yISPE1OOD7U+FgOBMd/V+5pQJRr46qbvG78hdrwZrjHrUy R+Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708763933; x=1709368733; 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=ccJLr7co0+ilhDtASovu1iFDy2FgTfoDl1sj3hMu582biMofHkt3MOxk+qIg0KT0uq 84aPCNhyTUEHMw/3Ru0vY9L2zURkRZjguI0myfgJv2yAi+BRdZuGmEm48kByBo1IcKqG 3AAwcf9rdDb2WEF/ChFgEp7c2RVd0vrsZhqvCbepcHHW9v8jhIfog4L8rxMuDSG1Y3w6 Fb0/aJjJIVhvWkjfQpANaLm9u0OAwa3/oZdLazwev5UxSHo9jyWjug9oN8rWFYm3WNdK x9ZpDTmTfU3DT0zmtBOetyJEV7I1nvo2QddoE9TAWgTuBDUqzyzj2pThfQ2Vu6NMrN4N fGBA== X-Gm-Message-State: AOJu0YyfsKhi8tKta+ut23Zfsdsf+VABt3iHBSFhT4ElL3ihs6TXD6m/ CBz7GArPWPvF4drDboOS1aCQeHbFPq/U4X3gAOSCBsoxfGhWZ4ZpSolPFjnEZXA= X-Google-Smtp-Source: AGHT+IHYf1kPfPFX5Zwv1oSCgY7c9JIJ3B4QVSWshVaXrFw3XNH0HGJX5aNGQbRNDi/0XOFa3UxJmA== X-Received: by 2002:aa7:c899:0:b0:565:9c99:8089 with SMTP id p25-20020aa7c899000000b005659c998089mr693385eds.38.1708762439364; Sat, 24 Feb 2024 00:13:59 -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 fk2-20020a056402398200b00565aed6c2a8sm160945edb.29.2024.02.24.00.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:13:59 -0800 (PST) Message-ID: <56a7c1308a1f1601299b8c7706fb4d00d5c185d0.1708761863.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: 60962 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 CE93927BBEA; Sat, 24 Feb 2024 08:23:01 +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, 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 68C0727BBE2 for ; Sat, 24 Feb 2024 08:23:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnIu-0003vl-Nq; Sat, 24 Feb 2024 03:22:40 -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 1rdnIs-0003vJ-Vp for guix-patches@gnu.org; Sat, 24 Feb 2024 03:22:39 -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 1rdnIs-0005wx-N2 for guix-patches@gnu.org; Sat, 24 Feb 2024 03:22:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnJF-0006LV-UR; Sat, 24 Feb 2024 03:23:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v11 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: Sat, 24 Feb 2024 08:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: 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.170876294424261 (code B ref 67260); Sat, 24 Feb 2024 08:23:01 +0000 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:22:24 +0000 Received: from localhost ([127.0.0.1]:37459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnId-0006J8-Ho for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:22:24 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:51219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnIa-0006Ic-AW for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:22:20 -0500 Received: by mail-ej1-f67.google.com with SMTP id a640c23a62f3a-a3f893ad5f4so225134266b.2 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:21:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708762850; x=1709367650; 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=EltqxQWd/xg+ZYUHMMNSUcN/01Mdtl4SKrZ2z4dit8FXm0vHiNsvcZ+GvxUWr5/3wJ Qu8GtadvPlfh+NcqckO4Extzabfv89JekycAUkto1Zuw9/2VULsdUWvI/l1HpThCV83L dQ7wrrZuvBRzUV1An56fAYLc4acIoW6TZyxSMUubd6404xtbhheVby1Dd1I3Ij+tLXgf aQA7Rw2hVrxrQX1AZ99TrZ0xXU6oHGRfZgckiAdMzYdGExx+scXHgufVoYMrD9hFcSF0 J0fiMAzGQo/H1meSiVGET8R2SdA3U0oz7UoS8nltQlatNtsA2tFr7BjQ7czZU5bXH506 zZ9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708762850; x=1709367650; 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=aK5mjr8eRh8xAgeTTUJCXg27f9m2P/3f52HvezhJvx8zt9ugkmd22qRpttuE+UgC+M I+wKQuwqDrk6kyMCqgZNG0UcfRCfrt/Ua6K/snpGsHaS3nHxRAo658M9S1OBFR8iy2yS wzUevwNVopSfZL+cJ45NBdYSGPtkQ+sb5NEjnbnA6eu99277Bc9X1Kv1O0nEpHTci09e 0CEjRGNyKnLSnsEB3cYuiwEqnEswuPyTwDkmRWZ7nWFI7WaMrDrXKRTlqeWFczBzJhvz lp3swjqEREVh7QuJwBAX/EzX7dYQ+WE+W6ijYQ48ywXn7PKQ+f5R+Sc/7dNddLUByMAS JuVQ== X-Gm-Message-State: AOJu0Yz8RGW5lD+Vzb/rMeJwdtV3J//4UI6QI/ifj7GBMV6+v8dJIxYr t3ERsJvQfSMPa0034xmoClOf5MyzZzg7mk5s79FKSw7tiewa+FMJ7JJDRiRoopE= X-Google-Smtp-Source: AGHT+IEYZkLL5wAqLSwu4twZUIg5Lw6kJg+VK6DweU4KOD/ADuCPAjWyiqKqhelvcgsr+gmdSkVrPg== X-Received: by 2002:a05:6512:31cf:b0:512:ac4a:4e07 with SMTP id j15-20020a05651231cf00b00512ac4a4e07mr1220582lfe.30.1708762440015; Sat, 24 Feb 2024 00:14:00 -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 fk2-20020a056402398200b00565aed6c2a8sm160945edb.29.2024.02.24.00.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:13:59 -0800 (PST) Message-ID: <6c43744210652d4031a4ca0dd5b6630b6adc40e1.1708761863.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: 60960 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 3756227BBEA; Sat, 24 Feb 2024 08:16:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 503FC27BBE2 for ; Sat, 24 Feb 2024 08:16:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnC8-0002Nd-NO; Sat, 24 Feb 2024 03:15:40 -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 1rdnC7-0002JD-8C for guix-patches@gnu.org; Sat, 24 Feb 2024 03:15:39 -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 1rdnC7-0004yC-06 for guix-patches@gnu.org; Sat, 24 Feb 2024 03:15:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnCU-0005z3-5w; Sat, 24 Feb 2024 03:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v11 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: Sat, 24 Feb 2024 08:16: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.170876253522919 (code B ref 67260); Sat, 24 Feb 2024 08:16:02 +0000 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:15:35 +0000 Received: from localhost ([127.0.0.1]:36938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnC2-0005xa-Ke for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:15:34 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:46586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnBy-0005wr-DW for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:15:30 -0500 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-5658082d2c4so1555224a12.1 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:15:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708762440; x=1709367240; 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=NaBmVrz8hEJm6RYVOy7D8RQ+Y+ee4lXZXTM44TM9QtN+Rn+plmLTugSSFpEZZYC6RQ XNhNhN/+IifzMzB2XBgjVsDVNChTIKmHjcPf1VZFBbhVJdY2V0vXgnhlYU9BkDatkZiJ t4LuDKPuxwWWxDpg7oiZlo/L/A3q+LGviBCDCBXJE/J+X4cc8ZtGsd7KsqMPq/3ZRPYk yOFmTh3YEH9Ri81VLN4L1uNrV8Q3IXfZ2TVBo0PS7KXhqqiSzOIM8Qd/ofSb7vgq69ce gSScZ9WPBRul0IfQ2XY18DJpQMU0cq50kaQ2SXQoNh7B5mAg8fX/hkBpedKWn72Ub7th uEOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708762440; x=1709367240; 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=HIu/dmBlenbYnv33Cgn1inMmAZm6uyMDGsziOZxWWDIGHOB90c8QbPlbWmU5I6WH5X i4BJC2CMKzicQtLYd4J83kcwX4ZC+tOKAHzAGfAQ1ETNhvq8u1nW2Afsb91OMu6lVh6f O6MahjMNtzqGEvAeRKEM0o2JPpMiUJlaQWfLBaWwc9Zo/dhV+kFJS86hbNmmpEQzHQ/x OmsdnWbIBv62730nLM0utA3n107Ssm5h/+jmgQszmnBgatfJlUkIL1UxznDgwT9m/XHJ YBnZPI73o5+PfHRv2hQpdp425Ja/9a0GU0MhEyV7gg5VmLTi/X4MmrxzVjJcwWj0qJ4N bjng== X-Gm-Message-State: AOJu0YwaHcfIoMI8athXSDdkxcaNXJko+b8Dz5Gky2WFAVKmPcyUgz8F 9q6fKGhfVr3ko9ONwAlAxX41XVQFRVtsAsk5466bvrEsIwL/VlEr+vcrrSOshvQ= X-Google-Smtp-Source: AGHT+IHdMWPoV/9V/qH7VUQ11n3gXrZVFDbvjpVqdo0qYTbhqSx0fM8Okt4Kl6mYMv1hzeBDPcJ5qg== X-Received: by 2002:aa7:de05:0:b0:565:aec5:1b71 with SMTP id h5-20020aa7de05000000b00565aec51b71mr210701edv.18.1708762440691; Sat, 24 Feb 2024 00:14:00 -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 fk2-20020a056402398200b00565aed6c2a8sm160945edb.29.2024.02.24.00.14.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:14:00 -0800 (PST) Message-ID: <9160cccd767cdfa55f7a460750c6b0f7544c12eb.1708761863.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-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