From unknown Sun Jun 22 11:39:25 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#67260 <67260@debbugs.gnu.org> To: bug#67260 <67260@debbugs.gnu.org> Subject: Status: [PATCH emacs-team 0/2] Think ahead when compiling Reply-To: bug#67260 <67260@debbugs.gnu.org> Date: Sun, 22 Jun 2025 18:39:25 +0000 retitle 67260 [PATCH emacs-team 0/2] Think ahead when compiling reassign 67260 guix-patches submitter 67260 Liliana Marie Prikler severity 67260 normal tag 67260 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 08:49:12 2023 Received: (at submit) by debbugs.gnu.org; 18 Nov 2023 13:49:12 +0000 Received: from localhost ([127.0.0.1]:47957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4LhA-0000WY-Cw for submit@debbugs.gnu.org; Sat, 18 Nov 2023 08:49:12 -0500 Received: from lists.gnu.org ([2001:470:142::17]:42184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4Lh5-0000W5-Ca for submit@debbugs.gnu.org; Sat, 18 Nov 2023 08:49:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r4Lgy-0000wn-TF for guix-patches@gnu.org; Sat, 18 Nov 2023 08:49:00 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r4Lgx-0005D9-6q for guix-patches@gnu.org; Sat, 18 Nov 2023 08:49:00 -0500 Received: by mail-wm1-x344.google.com with SMTP id 5b1f17b1804b1-40859c466efso3453105e9.3 for ; Sat, 18 Nov 2023 05:48:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700315337; x=1700920137; darn=gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=3rCHrOK0u0C3mDsh3Nu54oAvzHvD1EnjJgMr2m2aV1A=; b=AGHxkeqHho90ZU5mwzKfz+/gzvJnGn86bzw3kBHyFpo8fiMTAbAtya8y1UWV3g/H/W 5LUWaj7Tt8r/OhG5K4MI5cfYTf1c8CmVwIfuMmx1nbmdGfbLnpaFt+QYhdQQtp9l/HCI oJ5rMnbdVNSyiRZ+1/bILut4wbCOjt33zTHeae/mpwCFwNxp1EqOAzryVu9efWtCHyAg lZZPHzUTKrOqcNNdhal3LYeFFnM04iOSJO3G68RlJ0lhz5P8uXR642Ix7jDBpezuPvCK vCcW+NU0GGcgBb0aIlLNgWzMX3v+dIz3FbW0cKdkdg5IjT8G0AxQo05zNCjt0g+Q9eY6 apYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700315337; x=1700920137; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3rCHrOK0u0C3mDsh3Nu54oAvzHvD1EnjJgMr2m2aV1A=; b=Dom5Ew6YEKl9j7CtxNhiJ6mXxLu+Nl22IBSjmKEdXfdaL4iq9/EX4zC9++zz6iqdzn qRnZYSocoCoWtjZTejxlRa1EKuCczHeeEUJOnc5tZIinqz/bxJxVKCJ77mXVoDoCb2ub zwM0YMqUZX7azHxbIyiveTZ/nlTh4tBgECmTHrhksfYPnNQJwq4rDaWkDUCnVGQ0Nhcs QeNhQLscqKBqRmqsI4knnnmTxGpOiEj4Aoyh4iJ37kWcYzimpWSMUjgr9I6a7Ct7yra8 JOsO0+ViAcAMJnpCv2ZuE7ubC2/5wFWYG3usy202zoYcmgYISmY7u45S8FPCN6hyk4L3 XrAg== X-Gm-Message-State: AOJu0YyrQy63XAgcMbbdPB2ohFs/xk0zBkJaua9jQgNCjqYGiHGcF8f1 VE+z1TmYXMjftIXlAyBfo5koA7/04fj7xA== X-Google-Smtp-Source: AGHT+IHB0WVcwST0p/Ybp30aQizTAETTb0A6/wHHZhyvhI15LiRbHOY6h/3CAQUMA7WmIPaFdtC8Rw== X-Received: by 2002:a5d:47a2:0:b0:32f:7d87:bfac with SMTP id 2-20020a5d47a2000000b0032f7d87bfacmr1722211wrb.68.1700315337169; Sat, 18 Nov 2023 05:48: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 s13-20020a5d6a8d000000b0032fbe5b1e45sm5331612wru.61.2023.11.18.05.48.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 05:48:56 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Sat, 18 Nov 2023 14:42:06 +0100 Subject: [PATCH emacs-team 0/2] Think ahead when compiling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: guix-patches@gnu.org Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=liliana.prikler@gmail.com; helo=mail-wm1-x344.google.com X-Spam_score_int: 10 X-Spam_score: 1.0 X-Spam_bar: + X-Spam_report: (1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MALFORMED_FREEMAIL=3.099, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 4.1 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Guix, this series (hopefully) makes it so that everything we need to be natively compiled in Emacs a) is natively compiled, and b) is found in the right location. Please check that you no longer get gratuit [...] Content analysis details: (4.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Guix, this series (hopefully) makes it so that everything we need to be natively compiled in Emacs a) is natively compiled, and b) is found in the right location. Please check that you no longer get gratuit [...] Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Guix, this series (hopefully) makes it so that everything we need to be natively compiled in Emacs a) is natively compiled, and b) is found in the right location. Please check that you no longer get gratuitous writes to your local eln-cache when trying this out. Cheers Fixes: emacs-build-system … mismatching hashes Liliana Marie Prikler (2): gnu: emacs: Build trampolines. gnu: emacs: Don't hash file names in native compilation. gnu/local.mk | 1 + gnu/packages/emacs.scm | 6 +- .../emacs-native-comp-fix-filenames.patch | 93 +++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch base-commit: 60c97924e9519361494aaf0686e28eb831a42315 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 09:50:55 2023 Received: (at 67260) by debbugs.gnu.org; 18 Nov 2023 14:50:55 +0000 Received: from localhost ([127.0.0.1]:47991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4Met-00020z-1I for submit@debbugs.gnu.org; Sat, 18 Nov 2023 09:50:55 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:55336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4Mep-00020h-3I for 67260@debbugs.gnu.org; Sat, 18 Nov 2023 09:50:53 -0500 Received: by mail-wm1-x344.google.com with SMTP id 5b1f17b1804b1-40838915cecso3880065e9.2 for <67260@debbugs.gnu.org>; Sat, 18 Nov 2023 06:50:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700319044; x=1700923844; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Sad4wUVKHvTTFjE+YLtLDIsXleZ32l4H4dUbEoKk2ZY=; b=YJ6qcNG9z0SG+hkG7Nc/thKvTd7ANBdIpnR8vpNNTslcKOCbQIOwM7j02opNsqiEO5 qU77NbYl20issGzhT/I4lkbHSC3mMoym+LsZvWdv3ElQamoNGcggjHgK0omx5AP5G9dh 1sfX9bdR7E7UJyKIjMTnlq6B06rQt4urufpL/EDurlizAn3rXGzr2OPw5VcpUYB+DaI0 VBhF2ml2ywzSWgu3663mUR5RyuzoQ+JoKj9rq5iq2oEGLD77MnRg+vTlmog26EdgH95i zt8cOSsQdR8ou77qGfUS8PiZnCNwKh8MMN3hsQnc1WlbXjc/Z44F+9GkP45IXCqCm1C0 JYQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700319044; x=1700923844; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Sad4wUVKHvTTFjE+YLtLDIsXleZ32l4H4dUbEoKk2ZY=; b=EjivkUvjIUlyX6JdXHdPW22qq1lXDKnioZQQDgheMHDSlUe3P+UXyZ6Z/QJPffXfzM 9RcOBoqaY/Xaj14z9f8Zc3MUH7ZQeLqcRy/QpnSMQuQZmLZ4RHWNxmrsJNzlG5P7+rec 0DX9U643TC/F4LOkFaRiiD7kPsGJOhoiTsX+9PUKfnOYK7Jp0u+Gz1weqHPtyJAgGwk0 D5z+ROGJHFF1H5lbSO5IKCHZOQSVHQy19NCy7zVKer3rkJczTEQ9PEX0DvADdvUqsp7E vNkzvOOwRcjJySZHueFRd5rkcDhWkONT0DLAc/EPovZehtv0LjMS9te0ofRL6QyA+ymY f2vw== X-Gm-Message-State: AOJu0Yy2WOa4NMbWgeSYxIJqK9Ll55V48ngr2ZSbUSKFHxGT9RbcgTLn mRKOlRZhZp22U5FWQ5QPVuLyCAxFPDO4lw== X-Google-Smtp-Source: AGHT+IE/etGdnHB+jST5O9NgLxKm0D+rEBxTvg9mSN/2Hkej1tYOr5YJLTrRiEI7fevhnKgRBA8lTQ== X-Received: by 2002:a05:600c:19c9:b0:408:59d4:f3d8 with SMTP id u9-20020a05600c19c900b0040859d4f3d8mr1998893wmq.18.1700319043913; Sat, 18 Nov 2023 06:50:43 -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 k18-20020a05600c0b5200b004065e235417sm10729115wmr.21.2023.11.18.06.50.42 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 06:50:42 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 18 Nov 2023 14:38:46 +0100 Subject: [PATCH emacs-team 2/2] gnu: emacs: Don't hash file names in native compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 93 +++++++++++++++++++ 3 files changed, 95 insertio [...] Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:344 listed in] [list.dnswl.org] 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 93 +++++++++++++++++++ 3 files changed, 95 insertio [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:344 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 93 +++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8d817379a7..e878551b37 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,6 +1111,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.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 55eab48c25..822d15cc94 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -110,6 +110,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..f461bc8a78 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,93 @@ +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. + +Index: emacs-29.1/src/comp.c +=================================================================== +--- emacs-29.1.orig/src/comp.c ++++ emacs-29.1/src/comp.c +@@ -4399,8 +4399,8 @@ FILENAME must exist, and if it's a symli + 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. */) ++Value includes the original base name, followed by a hash of its ++content, followed by .eln. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); +@@ -4423,64 +4423,26 @@ 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 ++ /* We create eln filenames with a 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. ++ filename.el + content -> eln-cache/filename-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. ++ 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. */ ++ Lisp_Object content_hash = comp_hash_source_file (filename); ++ Lisp_Object separator = build_string ("-"); + +- if (NILP (loadsearch_re_list)) +- { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); + +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) +- { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); +- break; +- } +- } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); + filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, + make_fixnum (-3))), + separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ return concat3 (filename, content_hash, build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 10:44:19 2023 Received: (at 67260) by debbugs.gnu.org; 18 Nov 2023 15:44:19 +0000 Received: from localhost ([127.0.0.1]:49317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4NUZ-0003hk-9e for submit@debbugs.gnu.org; Sat, 18 Nov 2023 10:44:19 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:38675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4NUW-0003hU-TN for 67260@debbugs.gnu.org; Sat, 18 Nov 2023 10:44:18 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id A625760006; Sat, 18 Nov 2023 15:44:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1700322249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RAqj4Ry0p/ukh5fKiexEz8sj7/LC89vwsgQpC5qfV2Y=; b=noNuvjmQ7+Pma450MPow1sLGh6oReVIz5Nb5Rc7MEXHZMH+R/qW3YeOcg34dJSFgFzGprG sf7RlosJrBbXWly0PmHvfEOvpswOlvyC3q0lt1lWryN/Sb+hyHHCKiWxLJbbsIE25nxFcS UKkcO7mx0+rxZOSR0maKM0fLcJ4XtsXhfBvEVYPOfrUXXyUopzYhszKTZ+GpyCkhJb5wBY PHzBF0ojfKijBwEsA/fbDHGR+ZY35/NePTnBQiFYmQ4ni2aoZSieYsyRGJtm47bC7JqrfB U6KrumNTwATt2PS03IiUUU9vRdWyKpimhkYqlOSpB9Ty2KTuGkC6Rl6nhLBdUQ== From: Andrew Tropin To: Liliana Marie Prikler , 67260@debbugs.gnu.org Subject: Re: [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling In-Reply-To: References: Date: Sat, 18 Nov 2023 19:44:05 +0400 Message-ID: <87cyw72hiy.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-GND-Sasl: andrew@trop.in X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-11-18 14:42, Liliana Marie Prikler wrote: > Hi Guix, > > this series (hopefully) makes it so that everything we need to be natively > compiled in Emacs a) is natively compiled, and b) is found in the right > location. Please check that you no longer get gratuitous writes to your > local eln-cache when trying this out. > > Cheers > > Fixes: emacs-build-system =E2=80=A6 mismatching hashes > > Liliana Marie Prikler (2): > gnu: emacs: Build trampolines. > gnu: emacs: Don't hash file names in native compilation. > > gnu/local.mk | 1 + > gnu/packages/emacs.scm | 6 +- > .../emacs-native-comp-fix-filenames.patch | 93 +++++++++++++++++++ > 3 files changed, 99 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.= patch > > > base-commit: 60c97924e9519361494aaf0686e28eb831a42315 =2D-8<---------------cut here---------------start------------->8--- $ rm -r ~/.config/emacs/eln-cache/29.1-09dbbf4e $ guix time-machine --branch=3Demacs-team -- shell emacs-pgtk emacs-magit -= -pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q (require 'magit) C-x C-c $ ls ~/.config/emacs/eln-cache/29.1-09dbbf4e dash-6c86c585-82fea3ab.eln magit-log-58eeae71-b655dbfb.eln = magit-section-6e195547-0461e8af.eln git-commit-927a864a-05a352a6.eln magit-margin-ec1cc1e9-b1c0e957.eln = magit-sequence-40a35869-1b719931.eln magit-7056b331-38ef85d9.eln magit-merge-0070f654-7bc0ed2b.eln = magit-stash-06fe9f6e-f2a708b65jGJrl.eln.tmp magit-autorevert-54dea36c-bf1f5ea3.eln magit-mode-5ad95198-31fbb927.eln = magit-status-70fcb10a-f6654216.eln magit-base-cd520092-751fcac2.eln magit-notes-17dfe23c-ce57b283.eln = magit-tag-e968dc8c-f7b42d89.eln magit-bisect-8f9f6b8f-6fbb9bc2.eln magit-process-3e9d760a-410e523c.eln= magit-transient-1d163154-ba4b9651.eln magit-branch-b9c8386b-b362e334.eln magit-pull-1f116009-3bf3af7f.eln = magit-wip-99682fc2-0371c052.eln magit-clone-28b35658-e3db2e06.eln magit-push-08e42ed4-b67bbe05.eln = magit-worktree-8f50ba9f-7b120e5d.eln magit-commit-18780595-ac089f0e.eln magit-reflog-4106970e-69fc9edb.eln = subr--trampoline-6d616b652d70726f63657373_make_process_0.eln magit-diff-278da2fe-8132fe46.eln magit-refs-1e67efee-ab4fef69.eln = transient-29183598-be63c251.eln magit-fetch-5ba6406a-029daf61.eln magit-remote-55bccbe3-bb4a4595.eln = with-editor-415da08e-ddc1b93b.eln magit-files-1ee9fbef-d629cbfc.eln magit-repos-a48553be-da9ca79c.eln magit-git-736caf3b-1398a0cc.eln magit-reset-902f52f7-709d5f56.eln =2D-8<---------------cut here---------------end--------------->8--- =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmVY28UACgkQIgjSCVjB 3rDAZg/8CHlTWflVbLuAmXhFMKzrDiciXHbvync86H2N8G/+zvZxot5fvekMgN3J m9pEkW4DWsWH3G3z/fddZFdR0AHooVAD4cCw6WCso+8rk22KesIPafLJ/U05bPO3 XXZ7H75wlCjGt4rOMJcMWJe1XEaLX+cCiDjqRNdMSZDSrHYxU2mZFG7gJeSRXdJg cibV8u12mhV/SYs/zWwXdA0PxVhZvhKRer/sHyxJ6L+hmeNUgfDgxfGCXiNViGcV aardAYb6UucWqWLEnJF4Fiypgh1TKC+6tq3kBCvpexFzb0TAVPfjF25tEQ2MIYj5 9PBUWLLbxFvLZbnXsjtK0zlUyQaEBYV5Kr8MDRkr1Cv8oY/Gz09hOKvFin8EKGc/ HrrmUR0Z7oYN+JAD8minI+dbKpNmjEd8hCWs0ZQ5pu+oe97OxbjaGaURUo3bDV3B 75fBG4LNstcVHJKBBnxfr2Qka2i3IxVjHkQlSqt5n+eFv4+42kH7p2SG3R1U7v/W oQavS82du3iFXuROLsWsQ2tgU/5gUgcQva5ehmXhUGc+CTxT2Uy2yGPCo4Xu3Og2 ZeVRysGzdcedAevHWGSUIZK3XgFfz9xGXrvQqvRgeEafCReKTNF2X39s9HqXA3bV EsRuRPdLA4iQGhOy82mfp/H4Frf64cUYzMhB2IGRI9q8BdUGN0I= =j5wO -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 18 10:51:20 2023 Received: (at 67260) by debbugs.gnu.org; 18 Nov 2023 15:51:20 +0000 Received: from localhost ([127.0.0.1]:49327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4NbM-0003yB-2K for submit@debbugs.gnu.org; Sat, 18 Nov 2023 10:51:20 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:48393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4NbJ-0003xv-Gu for 67260@debbugs.gnu.org; Sat, 18 Nov 2023 10:51:18 -0500 Received: by mail-wr1-x443.google.com with SMTP id ffacd0b85a97d-332c09c0b0bso124340f8f.1 for <67260@debbugs.gnu.org>; Sat, 18 Nov 2023 07:51:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700322670; x=1700927470; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=1fCHFnNqNX5CZR4PcAtzsTI8LsyPKnzm0hbOzjcPWko=; b=GFCY4fEkrgwNeHogx0d/ZPKtCnr4m4OBTfnLgkdiFg4QBE0PHHqun+0KiUls7kZdYI wpTK8+N6LCODkUpxOF4rwjJkV+u6SEUOHJNwusUnjsMGcpu+GyKC0wb+JAHbQT1GTnut m6fey8iPjDE/TWG6Pxzw7gLXiJzZha2zo6coHd6o9ZE+ZSjXPiwjXsWURUnb5NaAsfI3 hvOJUto0Nsx3F6xGZZnaaozxQxpt8L8ssz8R9r2K2LRRrt3M64NJ7eEy788p7g8lb/QL qwhIqxDqhQtHTCg6XnuzhegsRMTat6d7jjftRxWv2azq4J0SdqrG3ykZPFe0waZCO4Fi wtAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700322670; x=1700927470; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1fCHFnNqNX5CZR4PcAtzsTI8LsyPKnzm0hbOzjcPWko=; b=HjWwVLbsALFLdoNNbNwv8R046I1BlLyXy+a3rKDeOOA5WjTHK5ABRns8nH+1EI1Xsh qI1kvH8T9sjMGTkbVszxhNgI54hU4VyOPeMhSzdiugFEmLk9Z9pxdMBytP1hwrV1u2l2 uhzSFXLKxRuY936QOXoeZ7HryBvMnyyyYQqJ+HUM7nSnu25Rl3GBbYb26rr/ZH8pt8Hb 5If//uJFPRnaMczW0CkKFNoHdjD60jAK9UXrgaUp2TXLK8UDSdrPmL7LuxeKfKtCOkko Sx8UBgTi25VVsW5/FNvWrNWOPuIfRiObsKdjrSw7iPfyKV461JEtMHm50E/nCtW/ceSQ fNyQ== X-Gm-Message-State: AOJu0YxhXkj4vsd2/InCdDhqLU0PH+nX1n+5OVr3/BU6+FswVBwkVWze BUH7Z6Ph2zfmIT06hQOc+ak= X-Google-Smtp-Source: AGHT+IGJwm8ofKW/Qzfc6wNezT1/58tz6xL79VlpHwFedwhqGN7rRoiLTJDj6vRCEohY6Wfl69p/rA== X-Received: by 2002:a5d:484f:0:b0:331:34c1:771 with SMTP id n15-20020a5d484f000000b0033134c10771mr1856650wrs.50.1700322670250; Sat, 18 Nov 2023 07:51:10 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f12-20020adff44c000000b003313e4dddecsm5566139wrp.108.2023.11.18.07.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 07:51:09 -0800 (PST) Message-ID: <17be83c41a55ccf5c74451fd031eab75dfe0eb70.camel@gmail.com> Subject: Re: [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling From: Liliana Marie Prikler To: Andrew Tropin , 67260@debbugs.gnu.org Date: Sat, 18 Nov 2023 16:51:07 +0100 In-Reply-To: <87cyw72hiy.fsf@trop.in> References: <87cyw72hiy.fsf@trop.in> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 18.11.2023 um 19:44 +0400 schrieb Andrew Tropin: > On 2023-11-18 14:42, Liliana Marie Prikler wrote: >=20 > > Hi Guix, > >=20 > > this series (hopefully) makes it so that everything we need to be > > natively compiled in Emacs a) is natively compiled, and b) is found > > in the right location.=C2=A0 Please check that you no longer get > > gratuitous writes to your local eln-cache when trying this out. > >=20 > > Cheers > >=20 > > Fixes: emacs-build-system =E2=80=A6 mismatching hashes > > > >=20 > > Liliana Marie Prikler (2): > > =C2=A0 gnu: emacs: Build trampolines. > > =C2=A0 gnu: emacs: Don't hash file names in native compilation. > >=20 > > =C2=A0gnu/local.mk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |= =C2=A0 1 + > > =C2=A0gnu/packages/emacs.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 |=C2=A0 6 +- > > =C2=A0.../emacs-native-comp-fix-filenames.patch=C2=A0=C2=A0=C2=A0=C2=A0= | 93 > > +++++++++++++++++++ > > =C2=A03 files changed, 99 insertions(+), 1 deletion(-) > > =C2=A0create mode 100644 gnu/packages/patches/emacs-native-comp-fix- > > filenames.patch > >=20 > >=20 > > base-commit: 60c97924e9519361494aaf0686e28eb831a42315 >=20 > --8<---------------cut here---------------start------------->8--- > $ rm -r ~/.config/emacs/eln-cache/29.1-09dbbf4e > $ guix time-machine --branch=3Demacs-team -- shell emacs-pgtk emacs- > magit --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q > (require 'magit) > C-x C-c > $ ls ~/.config/emacs/eln-cache/29.1-09dbbf4e > dash-6c86c585-82fea3ab.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 magit-log-58eeae71- > b655dbfb.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 magit-section-6e195547-0461e8a= f.eln > git-commit-927a864a-05a352a6.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 magit-margin-ec1cc1e9- > b1c0e957.eln=C2=A0=C2=A0 magit-sequence-40a35869-1b719931.eln > magit-7056b331-38ef85d9.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 magit-merge-0070f654- > 7bc0ed2b.eln=C2=A0=C2=A0=C2=A0 magit-stash-06fe9f6e-f2a708b65jGJrl.eln.tm= p > magit-autorevert-54dea36c-bf1f5ea3.eln=C2=A0 magit-mode-5ad95198- > 31fbb927.eln=C2=A0=C2=A0=C2=A0=C2=A0 magit-status-70fcb10a-f6654216.eln > magit-base-cd520092-751fcac2.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 magit-notes-17dfe23c- > ce57b283.eln=C2=A0=C2=A0=C2=A0 magit-tag-e968dc8c-f7b42d89.eln > magit-bisect-8f9f6b8f-6fbb9bc2.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 magit-pr= ocess-3e9d760a- > 410e523c.eln=C2=A0 magit-transient-1d163154-ba4b9651.eln > magit-branch-b9c8386b-b362e334.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 magit-pu= ll-1f116009- > 3bf3af7f.eln=C2=A0=C2=A0=C2=A0=C2=A0 magit-wip-99682fc2-0371c052.eln > magit-clone-28b35658-e3db2e06.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mag= it-push-08e42ed4- > b67bbe05.eln=C2=A0=C2=A0=C2=A0=C2=A0 magit-worktree-8f50ba9f-7b120e5d.eln > magit-commit-18780595-ac089f0e.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 magit-re= flog-4106970e- > 69fc9edb.eln=C2=A0=C2=A0 subr--trampoline- > 6d616b652d70726f63657373_make_process_0.eln > magit-diff-278da2fe-8132fe46.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 magit-refs-1e67efee- > ab4fef69.eln=C2=A0=C2=A0=C2=A0=C2=A0 transient-29183598-be63c251.eln > magit-fetch-5ba6406a-029daf61.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mag= it-remote-55bccbe3- > bb4a4595.eln=C2=A0=C2=A0 with-editor-415da08e-ddc1b93b.eln > magit-files-1ee9fbef-d629cbfc.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mag= it-repos-a48553be- > da9ca79c.eln > magit-git-736caf3b-1398a0cc.eln=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 magit-reset-902f52f7- > 709d5f56.eln > --8<---------------cut here---------------end--------------->8--- Oof. From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 22 07:17:00 2023 Received: (at submit) by debbugs.gnu.org; 22 Nov 2023 12:17:00 +0000 Received: from localhost ([127.0.0.1]:58171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r5mA8-0006G3-0P for submit@debbugs.gnu.org; Wed, 22 Nov 2023 07:17:00 -0500 Received: from lists.gnu.org ([2001:470:142::17]:37004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r5mA6-0006DW-Gz for submit@debbugs.gnu.org; Wed, 22 Nov 2023 07:16:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5m9k-0008KO-Dp for guix-patches@gnu.org; Wed, 22 Nov 2023 07:16:42 -0500 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5m9i-0006td-60 for guix-patches@gnu.org; Wed, 22 Nov 2023 07:16:35 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 92FC0240101 for ; Wed, 22 Nov 2023 13:16:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1700655389; bh=gRS7oaTmyQcRdOOJCQSxyRE40yUJpH/iAKZZkdPAG7o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=nQY2XOf9mjRx297JzkUsR1Sv7hRRPP6KM57wmGMIxDVYsNCg7Gs+YAQCVBEpCFNre xe+bJxe4ktSSuHbATOncdvGLU3bj1+F84oahNZvWNApqTcCc0nikYq1vM1nGOlTR+/ r7q94+kVx9TirmArm92dq2UgSyKu/VPGMuwDMHic2tl/C5cuLFUnd+W2PEyvYae18c CRSKGilyB6NDCFYSN03wK90ed0kWygXEJIqPAtI3Y6eIPr9u6qQWcs8wdLx85Q5b0d F6JNjsEloxGKTkv1nKP+nWfp/AKaQcSZ7EsjxhdeJGutNGcEn8H0GVuGdWcEdiQH1B nr+naF4j6lCYg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Sb0bJ02d2z6v00; Wed, 22 Nov 2023 13:16:27 +0100 (CET) References: From: Mekeor Melire To: Liliana Marie Prikler Subject: Re: [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling Date: Wed, 22 Nov 2023 12:09:35 +0000 In-reply-to: Message-ID: <87o7fmyohc.fsf@posteo.de> MIME-Version: 1.0 Content-Type: text/plain; format=flowed Received-SPF: pass client-ip=185.67.36.66; envelope-from=mekeor@posteo.de; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, guix-patches@gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) 2023-11-18 14:42 liliana.prikler@gmail.com: > Hi Guix, Hello and thank you for your efforts on this issue. > Liliana Marie Prikler (2): > gnu: emacs: Build trampolines. > gnu: emacs: Don't hash file names in native compilation. It seems like this is a series of two commits but I only received one, namely the second one ("2/2"). Is it just me or did the first commit went missing for everyone? Also, are these commits still on emacs-team branch? Andrew's command (guix time-machine --branch=emacs-team -- shell ...) made me assume that these commits were pushed to emacs-team branch, but I can't find them there. I'd be glad to try this patch-series out - at some point, when I have more time. From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 22 12:39:33 2023 Received: (at 67260) by debbugs.gnu.org; 22 Nov 2023 17:39:33 +0000 Received: from localhost ([127.0.0.1]:59852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r5rCH-0001Jv-Ev for submit@debbugs.gnu.org; Wed, 22 Nov 2023 12:39:33 -0500 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:61770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r5rCD-0001Jf-AA for 67260@debbugs.gnu.org; Wed, 22 Nov 2023 12:39:31 -0500 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-5491eb3fb63so38330a12.3 for <67260@debbugs.gnu.org>; Wed, 22 Nov 2023 09:39:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700674760; x=1701279560; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=s2VfdTV/Kuj6QDWjpSdMPtTRrTv0InOgc9cl59qXIxo=; b=jFNnaq08dGAxqdz6H467jmrtvhZJgUsZe0UZJdJCtMSgx1eg8icZ+VssnNWqeLdTvz 2Vlt5LVjgL83pynpZxIAbTqHgMcTO/FK6rL9nw5+AdU2ZyH2vDySOxUmvYuqLO0fSD5B Fg+KPMzKd+FlaM3fcepSM3Ftdgi/05Mm/OEmnDmDxUEm0NmUhyXLse/VeFXC6P1CPB9m c+OFs1pWKbRsT6ie96+jpvEkw8LeEOei43h24ZTSorlWVo7/+lC1tpASGEPYAFNT4eoX hnFeLFrc56sbxsmRve8WaiXlPAGz1Gifmn7Kx1AVaNk9DJTjwmfjdcdIQ1ezAHYpdiiY WVzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700674760; x=1701279560; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=s2VfdTV/Kuj6QDWjpSdMPtTRrTv0InOgc9cl59qXIxo=; b=QRwRikbrToP1+czn9wbx9+t7h3LV+nYc2LXOMNy52tokhKsGgth9lb+WeftrDa53bg p6nEuTcNUDK9VkUKbHhy1blf+oMJLxLZhAWCy8bXFBCOEJjzsNcgF7J8UZAl/S1XrxVl mBPUGbrC8E50pt96dwMqPzD45HQhEFJZB6je7ZruUQwOd9Y8EVxgtBoMYFBRA5xvQFGW mbVgvw3CtsyCVx0b86ddGU5zsSigx+KihO90iJyzCGLlCBNPgoiFLdaLrfgWm6cnAV9H 5w8SiTC+dtXv/J+LN8TlRGiT7bvNpqfRuvmr8sI3KvXaV54ya4bXyWSHMcRHnpIeOpii WIow== X-Gm-Message-State: AOJu0Yxiv/7fD4+nrSudQxiMzbBB/xapUOPUz2pqE+s+bTJK5hy7xqRX xUCbOBpUZ7T7FJV/SLTFuS8= X-Google-Smtp-Source: AGHT+IG+Smq+WDEBhPGswfa1mf1+Wv+BLBpwRcCUrvuKXgJjfGDDnygDNxwxMUIN0MG7eXG7HFazHg== X-Received: by 2002:a17:906:c44d:b0:9fe:4d14:800e with SMTP id ck13-20020a170906c44d00b009fe4d14800emr876527ejb.39.1700674759789; Wed, 22 Nov 2023 09:39:19 -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 t11-20020a1709064f0b00b00a0353fd24a5sm8167eju.184.2023.11.22.09.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 09:39:18 -0800 (PST) Message-ID: <243d8344190823ba30365f10fb05345f7e93d710.camel@gmail.com> Subject: Re: [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling From: Liliana Marie Prikler To: Mekeor Melire Date: Wed, 22 Nov 2023 18:39:17 +0100 In-Reply-To: <87o7fmyohc.fsf@posteo.de> References: <87o7fmyohc.fsf@posteo.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 22.11.2023 um 12:09 +0000 schrieb Mekeor Melire: > 2023-11-18 14:42 liliana.prikler@gmail.com: >=20 > > Hi Guix, >=20 > Hello and thank you for your efforts on this issue. >=20 > > Liliana Marie Prikler (2): > > =C2=A0 gnu: emacs: Build trampolines. > > =C2=A0 gnu: emacs: Don't hash file names in native compilation. >=20 > It seems like this is a series of two commits but I only received > one, namely the second one ("2/2"). Is it just me or did the first > commit went missing for everyone? >=20 > Also, are these commits still on emacs-team branch? Andrew's command > (guix time-machine --branch=3Demacs-team -- shell ...) made me assume > that these commits were pushed to emacs-team branch, but I can't find > them there. >=20 > I'd be glad to try this patch-series out - at some point, when I have > more time. These are commits submitted to the emacs-branch =E2=80=93 they are not upstreamed yet. I'll have a v2 up hopefully soon; things sadly aren't as smooth as I'd assumed. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 25 03:23:05 2023 Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 08:23:05 +0000 Received: from localhost ([127.0.0.1]:37741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6nwP-0007l8-5j for submit@debbugs.gnu.org; Sat, 25 Nov 2023 03:23:05 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:56430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6nwM-0007ka-Kz for 67260@debbugs.gnu.org; Sat, 25 Nov 2023 03:23:03 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-9ffb5a4f622so369824266b.0 for <67260@debbugs.gnu.org>; Sat, 25 Nov 2023 00:22:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700900572; x=1701505372; 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=mSSkdOcBLgDMxvIhk/I0LXd3Ez3dZlfIMGxAVjyAo2XP2ybuIBSoyW8WRNrBSZYq81 GsldiU8HMQXMXm/O5orYXBCJSlisiY1PQ237KNm3kvWXZEfJCG/z6fGCzvifUVH8c7VG dX+Eh7hoabs+nTmjGfylCPjMmrMnbwz9HkvqJVNQ1c5+dn1wu0l0FhbMPv9UP/1SvYJs FMvIOrhMoWw8MIRTxGR36NjVe4/8eoAvt0Z4QRtPzqsaf5R2+u66i4w79QfmbbjbkGU4 WTDehFtw6yLLLy7vBYacpCGWqRFHWwvbUwDrZoOmp3zlrLu/ycgQq6vm5aUPBO6Ks82Y f49A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700900572; x=1701505372; 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=YMT1BNTILQ+aJV63apmZ0P0SoY/DLWYCcsWDHftLBTa15tpwnCbPdXhO0QW8mwDfex t4WwWgAbD+6Mmgs7Z37c3gD5CHTqPgiyjkNu5kXkZHbkc2cLpuAHN3Qi2N7tI5eGzqP1 mpJ6pQrXHybxE1k8dlxLdI0zSo7uu2rwM0IwArLXYogG7dY/gfz0PTJNrb6R9f0Eisqa eyAtmyCYbqVnqkzOLVvQq3XxsIGFT1UuLBvZnEjs/E+KSnBqkDSSSFF+RypuXN3wd3KZ lhgbDtAl82NkdiWVtTvo9FvDBKA9ZBWKbG3+oSDCSUXz6UvvKLYeFwp3Dp2dQoRdL7ni oHmw== X-Gm-Message-State: AOJu0YzZPc75g+SaHnXUJ/6IMQYtncn1iN7S+9cP0D4V1jLrJdTm9Rex NBPgVMjs6HX8Y4tzb9+BN0KvEyYpvj+gig== X-Google-Smtp-Source: AGHT+IG8xJsQ9UMQ32qt2/w6JSoLUhbw9R91usP8rlvsQ3eCi1Pbqz6CPUQs6p+jfASzD8IqvKmh5g== X-Received: by 2002:a17:907:2992:b0:9ff:2374:1571 with SMTP id eu18-20020a170907299200b009ff23741571mr3193293ejc.69.1700900572009; Sat, 25 Nov 2023 00:22:52 -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 kq4-20020a170906abc400b00a0b7304c368sm606269ejb.89.2023.11.25.00.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 00:22:48 -0800 (PST) Message-ID: <28de2575a98876bed2c1c2762871639733d75a9f.1700900541.git.liliana.prikler@gmail.com> In-Reply-To: <190e882ba2705f244b04231112a9926e9dcebc29.1700900541.git.liliana.prikler@gmail.com> References: <190e882ba2705f244b04231112a9926e9dcebc29.1700900541.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 25 Nov 2023 09:18:26 +0100 Subject: [PATCH emacs-team v2 3/3] build-system: emacs: Compute relative file names. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , cox.katherine.e+guix@gmail.com, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 25 06:14:56 2023 Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 11:14:56 +0000 Received: from localhost ([127.0.0.1]:37987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6qci-0006yW-Fv for submit@debbugs.gnu.org; Sat, 25 Nov 2023 06:14:56 -0500 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]:59446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6qcg-0006yC-Jc for 67260@debbugs.gnu.org; Sat, 25 Nov 2023 06:14:56 -0500 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-50ba75e33f3so1029456e87.2 for <67260@debbugs.gnu.org>; Sat, 25 Nov 2023 03:14:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700910883; x=1701515683; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=nbe/Qdkpde9cPhGDPSbUyUB9VLLzuxgkj7vltUeZa1g=; b=UTqHo4If0chR3/DVkcSKj5VAsBdvhFNgJhDTiHNMse463d2KZICRegEPLVeM/aK0KC ImQUDaVMu+ZTHm0UwE3YsowPzNQx1I3MIaakkrri4Kfw2bsnE50013xChVeh3JIkFQr/ B3E7ZfTnvzrdpOlSixCpmSXjDNzQD9ciAoc+L3RoGND6tiYHfd6KoRhItgc81idMQ9FA dTRCA2RPxrCuhqCZ520cUP7HtbTqdKWHZJfafhM3LJzPKSRYJn7BCELFg4MhI1wpXl0V DkD2zF08KZtu6He1hZ7/4ETVY0XUA0+EuPMkT3hp8ZTzqA54axBpui0ZSnB7U5s9qgnB QrAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700910883; x=1701515683; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nbe/Qdkpde9cPhGDPSbUyUB9VLLzuxgkj7vltUeZa1g=; b=YV6Fj+Wm1DeZJ38M5Z0LQaiuowSdx9qrEiV2cTAYAJ8q4oHvVAtQB7tRqcALTYKqHE yzOrrWj55Gy5ouTZjPdL0BnIji2+UDz+t92SlSO0LqVepKmTYvj9nxu9mbO2eHdb928Q gHZuIfLkvoDeyc4bKJJGiCecyyUBqojljSi4ArHbqmdIjDmOwAaqhzs/tPqzyEyYda1e TypZYsgoUDXg0tijpUB5T2dCRMJ8MLMqVqyosPlM3BvhQABmMu5MJ9YDEQvq+xbH4YxR XoK4NY1hhOnrMiMKhj26E7TKcokvmga++BcDM+K0cG4z3MnXJmi77lyO+ujp0nrM8n9p s53A== X-Gm-Message-State: AOJu0Yw5f1tZh6AthtiQUNK3HwubeAtANC/bZ2qLEqMOGbkfv9KimMGT EAiBNl1dDgnENRyGv7MlxTM2ROVb9aM= X-Google-Smtp-Source: AGHT+IFfzhmp+0DqhDQRwCiqyL/GhdWpaAVoRygsGk5DtCk4pUG62mq6jl8N6RnhQ0QAyK9gBOmWpA== X-Received: by 2002:a19:f00f:0:b0:50a:aa72:27eb with SMTP id p15-20020a19f00f000000b0050aaa7227ebmr3729596lfc.41.1700910883295; Sat, 25 Nov 2023 03:14:43 -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 z2-20020a170906434200b009ad7fc17b2asm3287246ejm.224.2023.11.25.03.14.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 03:14:39 -0800 (PST) Message-ID: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 25 Nov 2023 12:13:51 +0100 Subject: [PATCH emacs-team v3 1/3] gnu: emacs: Build trampolines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:12f listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:12f listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 b9d9e2b891..55eab48c25 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -327,7 +327,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 base-commit: 60c97924e9519361494aaf0686e28eb831a42315 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 25 06:15:01 2023 Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 11:15:01 +0000 Received: from localhost ([127.0.0.1]:37991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6qcm-0006yo-Qb for submit@debbugs.gnu.org; Sat, 25 Nov 2023 06:15:01 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:61594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6qcj-0006yJ-DN for 67260@debbugs.gnu.org; Sat, 25 Nov 2023 06:14:58 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a02cc476581so363991066b.2 for <67260@debbugs.gnu.org>; Sat, 25 Nov 2023 03:14:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700910886; x=1701515686; 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=mYHZtJG6nIa+GI8VTKMOW5Cp0BJDMu0YaL+wAhcv1nk=; b=gBHArZHnno6MPhda3+XSQZP1H+y5xa4f6OTLL1n0UeOuTH0N98kGCX+NnHOQxpiKfO 1uLHh0aDWDt477nB5dKI68uoa4QJmx7nVCzWTTTe+OGuMazxKbMUZZdlQaN+KBp7MuuK UWM2tIzqM4TFLEoQsEauW/H1XQdgBlwuZAydr2wRLxMDIHovy2H+VGRg76YQa1ksxRd7 KOU2tz0EdBZz7adK153c9Ypsnk4T41pZdk5+z9J38JO4spdzh5wXsSLcRb+ErEMTxd5n RL2AEMGw7th7Yqwd3t3moDtA9fm6eK52Mqqa2Xd7YvVGFB/ZHQ1JsOP23qaevpz1jvgQ qLNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700910886; x=1701515686; 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=mYHZtJG6nIa+GI8VTKMOW5Cp0BJDMu0YaL+wAhcv1nk=; b=lw3Heenjpneyt+8kb0WfraijSYU9xj2TYpICM4CMefzayvfhdq7SGVuFxX+eFq3Urs hH/opZPy+ofLDGAKuvXz/3cWgoCwOqQRB1w/6CXjnSbA3vEArhSqeMm2Ql2iTCwJT0+x DSf+DUjiZHGfJwaCH9rISv6krKncvGnZriJ0QL5iWgOdcd05EzSFjStK2L1Fm2Aw6iYG EqULUupl8qiUQOVj6Mw3YfuZisKLNqYizZCr2jAt7xBBAnrl+8CiDyPWxyCn0Z1bkiPK nvbhEMhqXPbS8Ndw0W5B1U4+XaSZ17z8SoQpOmC7PFWxkGWqCvoprcEtxZE7SgQbLoOR EClQ== X-Gm-Message-State: AOJu0YyLN2nCa21KUr/awo1zYQQgC+j1o3IYcPvrKOX7fJ6CpyOZ9G4w aua/Pk/58SfZUmtDuuKrQvPxPNmBUkY+rQ== X-Google-Smtp-Source: AGHT+IGp1bsRFiz6YLZEIiDXqvJ855ELy7LCRke9b4wtXYqpjsSehvxj/UybMpn6j1N0JGm/z35JGg== X-Received: by 2002:a17:906:1d5:b0:a0a:c652:9bf8 with SMTP id 21-20020a17090601d500b00a0ac6529bf8mr2283764ejj.45.1700910886275; Sat, 25 Nov 2023 03:14: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 z2-20020a170906434200b009ad7fc17b2asm3287246ejm.224.2023.11.25.03.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 03:14:44 -0800 (PST) Message-ID: In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 25 Nov 2023 12:13:53 +0100 Subject: [PATCH emacs-team v3 2/3] gnu: emacs: Don't hash file names in native compilation. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 197 ++++++++++++++++++ 3 files changed, 199 inserti [...] Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 197 ++++++++++++++++++ 3 files changed, 199 inserti [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 197 ++++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8d817379a7..e878551b37 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,6 +1111,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.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 55eab48c25..822d15cc94 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -110,6 +110,7 @@ (define-public emacs-minimal (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" + "emacs-native-comp-fix-filenames.patch" "emacs-pgtk-super-key-fix.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch new file mode 100644 index 0000000000..714b707e47 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,197 @@ +Upstream hashes both the absolute file name and the content of a file +to derive the name for the natively compiled files. This breaks the +staged install used in guix, as any $GUIX_PROFILE is distinct from +the build directory. It also breaks grafts, as hardcoded store file +names get rewritten; thus changing the file hash. + +Index: emacs-29.1/src/comp.c +=================================================================== +--- emacs-29.1.orig/src/comp.c ++++ emacs-29.1/src/comp.c +@@ -4396,26 +4396,18 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc + Scomp_el_to_eln_rel_filename, 1, 1, 0, + doc: /* Return the relative name of the .eln file for FILENAME. + FILENAME must exist, and if it's a symlink, the target must exist. +-If FILENAME is compressed, it must have the \".gz\" extension, +-and Emacs must have been compiled with zlib; the file will be +-uncompressed on the fly to hash its contents. +-Value includes the original base name, followed by 2 hash values, +-one for the file name and another for its contents, followed by .eln. */) ++FILENAME is resolved relative to `load-path' and only the suffix of ++the first matching path is kept. If FILENAME is not found to be relative ++to any directory `load-path', it is used as-is to construct the return ++value. Further, if the NATIVE_COMP_BOGUS_DIRS environment variable is set, ++the first matching prefix mentioned in it will be stripped as well. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); + +- /* Resolve possible symlinks in FILENAME, so that path_hash below +- always compares equal. (Bug#44701). */ +- filename = Fexpand_file_name (filename, Qnil); +- char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL); +- if (file_normalized) +- { +- filename = DECODE_FILE (make_unibyte_string (file_normalized, +- strlen (file_normalized))); +- xfree (file_normalized); +- } ++ Lisp_Object rel_name = filename; + ++ filename = Fexpand_file_name (filename, Qnil); + if (NILP (Ffile_exists_p (filename))) + xsignal1 (Qfile_missing, filename); + +@@ -4423,64 +4415,53 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); +- +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); +- +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation +- +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ +- +- if (NILP (loadsearch_re_list)) ++ FOR_EACH_TAIL_SAFE (tail) + { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } +- +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) + { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); + break; + } + } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; ++ ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); ++ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } ++ } ++ ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4475,7 @@ If BASE-DIR is non-nil, use it as the di + non-absolute BASE-DIR is interpreted as relative to `invocation-directory'. + If BASE-DIR is omitted or nil, look for the first writable directory + in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory +-whose name is given by `comp-native-version-dir'. +-If FILENAME specifies a preloaded file, the directory for the .eln +-file is the \"preloaded/\" subdirectory of the directory determined +-as described above. FILENAME is considered to be a preloaded file if +-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME +-appears in the value of the environment variable LISP_PRELOADED; +-the latter is supposed to be used by the Emacs build procedure. */) ++whose name is given by `comp-native-version-dir'. */) + (Lisp_Object filename, Lisp_Object base_dir) + { + Lisp_Object source_filename = filename; +@@ -4541,19 +4516,7 @@ the latter is supposed to be used by the + + if (!file_name_absolute_p (SSDATA (base_dir))) + base_dir = Fexpand_file_name (base_dir, Vinvocation_directory); +- +- /* In case the file being compiled is found in 'LISP_PRELOADED' or +- `comp-file-preloaded-p' is non-nil target for output the +- 'preloaded' subfolder. */ +- Lisp_Object lisp_preloaded = +- Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); +- if (comp_file_preloaded_p +- || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), +- CALL1I (split-string, lisp_preloaded)))))) +- base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + + return Fexpand_file_name (filename, base_dir); + } +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/src/Makefile.in +@@ -553,6 +553,7 @@ shortlisp := $(filter-out ${shortlisp_fi + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 25 06:15:05 2023 Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 11:15:06 +0000 Received: from localhost ([127.0.0.1]:37995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6qcr-00079d-MG for submit@debbugs.gnu.org; Sat, 25 Nov 2023 06:15:05 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:60647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6qcm-0006yO-FZ for 67260@debbugs.gnu.org; Sat, 25 Nov 2023 06:15:00 -0500 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-54b0f2c50eeso1032204a12.0 for <67260@debbugs.gnu.org>; Sat, 25 Nov 2023 03:14:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700910889; x=1701515689; 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=JmlDKbp3P1Q9z1XZn4Xf7v3f7dULrHb7cUSRpbSd4AgOMpSLBBhrqSivzJsD7hTKlA JwIsuQrV6XGxRTnhS3qXYLI8HKgf3Wp5Uc72Ql3blNV+jGumMen53YiVAtiICl66+xEN uKw3z8y2XHBIvKs1sPp1TeDsTISzedFQiZ7SW2lOVC7lAuywrxOZCzSZkOy7RnLWGu5h z2/uS/qtjAS9yrqqQYccPCqQtxsQ+K8H4xQV+CfevJu8882Njfhz7y6CxntQtk1kHmu6 h6ASIg4FFPoQo1VYN8dZZQ91N/+4J4CYD20h0FWTWJ9sLpOHNrB7w+F+P4Ff7ZXpaW4c 0ANw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700910889; x=1701515689; 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=fUd9KqA2zaqpgyBuxqagZRw3wvKoD+/0xUw6w62w6LQkQZsKGZp51FJ3LGUkd7ITXi ZnfMcbJMaTM1rP9e3rH44xNNyLhigPcEpSoQx8paE4ibL7IqzNgIiDeyBpOMVNup4W/D oD6wdKMsnglEwUo50Du8QRonXNYvxXf8/CN7m+OIonISeh6MS+3pIAsy48ltGLi5b41A CEOr4WrjZRYNJGJ+0A2rWcEB1Dm3ZZFu2gsVfnLwme8i5t8GAephijSSh/HG5i1UtNGt sF22rRkUtx80jiqWwW0hADuVLdQr54S77CFoACjo4C02qvVHxpyg7s5zEFyl2JXkgiLe gZdQ== X-Gm-Message-State: AOJu0Yxrps8XFan4CQqwRtUPJsQZLs3lCdd0f8P/y8N0AuT6VFCX4ROf kQzLcc6POR5jASQE1Rg6dgRVoSwaIZmxlA== X-Google-Smtp-Source: AGHT+IH9pRRHCggTu1Utck8td+yXdrJ2bhUUlYNM5bZ9tnoov/Cu4sxz/yFx5MmifwToXOKl+NxVUQ== X-Received: by 2002:a17:906:a1c3:b0:9d2:9dbe:a2f9 with SMTP id bx3-20020a170906a1c300b009d29dbea2f9mr4396445ejb.50.1700910889489; Sat, 25 Nov 2023 03:14: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 z2-20020a170906434200b009ad7fc17b2asm3287246ejm.224.2023.11.25.03.14.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 03:14:47 -0800 (PST) Message-ID: <2460e8aa5efadac8e330bce567a1a2547c2393e7.1700910860.git.liliana.prikler@gmail.com> In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 25 Nov 2023 12:13:53 +0100 Subject: [PATCH emacs-team v3 3/3] build-system: emacs: Compute relative file names. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:544 listed in] [list.dnswl.org] 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:544 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 08 06:53:51 2023 Received: (at 67260) by debbugs.gnu.org; 8 Dec 2023 11:53:52 +0000 Received: from localhost ([127.0.0.1]:44015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBZQV-0004SW-MA for submit@debbugs.gnu.org; Fri, 08 Dec 2023 06:53:51 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:58571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBZQT-0004Rs-NH for 67260@debbugs.gnu.org; Fri, 08 Dec 2023 06:53:50 -0500 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-54c1cd8d239so2781240a12.0 for <67260@debbugs.gnu.org>; Fri, 08 Dec 2023 03:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702036411; x=1702641211; 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=nU4zvREmpTqgGxjaIg5v4BsLmLdrT9MeTxQzuQszmXk=; b=KNnXojKBcSlS937blkdkZT3TKy1pOaW28wOvV2660MvcXev/cPL4qTn2KRYXqUM6GP HInDgNs3od963sU4wCHNf+3KBzx9Ad7HDSE4Kztxsd4Zi5h2Kf2IqxJa8cF67ehBCQfT X+ZugXEorKfbVqqBjGaf/g4GysYrjUeZ8NhW2ViD7nBvy6SLb12ya+OM8ihOAdMHBJ63 2ee9RK8BZqUtERwHq8e352o9L7G8kAWCESZNG6ZMI/aWHkRWqFAu7m2fVhhG3GqpEbgI /4zBoTE5Etb/hppIbFWT7xR/v/9TjbJapC4+v4Rqk0H6KETkVeY/lakOymXkWQDi33M4 UpEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702036411; x=1702641211; 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=nU4zvREmpTqgGxjaIg5v4BsLmLdrT9MeTxQzuQszmXk=; b=SSMsv7nufXXhFo5gLLSmYu9f+0pFz9ciR6XOdPVwQ5Xv2NJc8HOuLT29eX01U+Q4SC Xsx2ww0XKzjNK9ALL7fNhma1TyI0/h1DH3bZcLsdr5dzet0UXyqn/NObVzZpifJnjdT3 +AmICk/9vEYy46IRG/rNZWmFg0E4Alwg/qwTtoXSDjYXBOjeLCYtlq/c/fMKEBz19CES kiiUNJGlEYEZ14M2BOjV/6hQW0dTBZvLeRnBEhhEoJhJFWMuHmMfOMrv/D03d0VO6S/v U7BgPc1Dwu6mDGThKcwtqpzdnE3KAeya48EAEkt/Fw4cr81qlG+X+U05tW9uW3GPtZU0 r6zQ== X-Gm-Message-State: AOJu0YzQJ44xNxvSE+Tyx3vyWDRdYnhVGyonHbckDQFUkRDQxUSKCdyb RVMazxmUcm2h+a0dvezw3CwYslJCayoFAw== X-Google-Smtp-Source: AGHT+IGS8Kuy/ju4nEVMkK7XwMCVTBXceutAC5IWk26PdSo/bn39i2Mw4mKv0hrSMgkVGu+NgS8odA== X-Received: by 2002:a50:d741:0:b0:54c:4fec:fc with SMTP id i1-20020a50d741000000b0054c4fec00fcmr1197996edj.139.1702036411155; Fri, 08 Dec 2023 03:53:31 -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 g6-20020a056402090600b0054c9211021csm712424edz.69.2023.12.08.03.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 03:53:30 -0800 (PST) Message-ID: <31685a8dadad82f6b7a217149599f639fff0d99b.1702036387.git.liliana.prikler@gmail.com> In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 8 Dec 2023 12:16:55 +0100 Subject: [PATCH v4 4/5] gnu: emacs-org: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(+) Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:544 listed in] [list.dnswl.org] 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(+) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:544 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 9bb07663ee..80b3136284 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16461,6 +16461,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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 08 06:53:52 2023 Received: (at 67260) by debbugs.gnu.org; 8 Dec 2023 11:53:52 +0000 Received: from localhost ([127.0.0.1]:44017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBZQW-0004Sc-0G for submit@debbugs.gnu.org; Fri, 08 Dec 2023 06:53:52 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:43020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBZQU-0004Ry-D3 for 67260@debbugs.gnu.org; Fri, 08 Dec 2023 06:53:50 -0500 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-54dca2a3f16so3313887a12.0 for <67260@debbugs.gnu.org>; Fri, 08 Dec 2023 03:53:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702036412; x=1702641212; 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=UzXt/e4HSCpriM108i6H9pFBxue4UPFA9EuDwSzhcOE=; b=ZGBju4MuUZ7U9oPW8OsQPdakRviM4ZznU9joqnbggL1fNFskNjXlyQjYMcXXB4JEMz GenK7y+nGU4BOrRJ6O1hpIBybUJe8USqdKi3DgjZn6NPWMvWc5VJWVUjUeo4X3/lD5Dx F6mMiTKPXYDI6MMXaQ6XlJl+abb/vkIPE+3fpx9rbQoBKulte+hUW6vc9WXdCUaDs3FY auy38TlvLNglNDpUYPz2cJ62F/rv/js1DXwefAUtxlha+2jDHC9K0IHZkG/7UsJEqUpA V3Z0C0fILjIKeV+iEgoGAFQ8u0VFkRA5ff787cY1m8nIoTwmpckYg/1NIHO9cwQxVvEc OXkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702036412; x=1702641212; 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=UzXt/e4HSCpriM108i6H9pFBxue4UPFA9EuDwSzhcOE=; b=mzUTjhdwxjOyt1T83GVl9TPDJ905UceTYAEy/YTjEIFdGoRqqO4J8qEhKWNI33eita qPvb3JIZeYF50i1K/vF38zycQof16037320silT/fGqaXxSvRkiFSsjZQBjIWySnZPCP 1AfyePQvhjX6q5+3UTLXXWPWOwlRLxXHwfRCBkfV8duELSwgR03ZrOxoXz2A4+a+TIYc N8pww2pDNoaBiXM8s2DxmUhncQXArQs9D1T/OndHVGHm3b8CbKTcwJwt6eUr35ClXzUW Fi/YUlAEPAZ1ZgZT4x+q3RRcS84xLkGX5SWajeebVhLMQTn9qjDySA9PK1dg9wGt7epf RN+w== X-Gm-Message-State: AOJu0YwsmyvVICF0Blk8ISI5xHC22EYRCoxftPT+X31OFMqF+a+KXkw0 Pebk/xDLOi91U9hSOkmVsFgMbXMjpfRUbg== X-Google-Smtp-Source: AGHT+IFuaO8oeyGXl0ytsyAUqldDIgwPL1Ki3eaWjPCqoYmtbgKRde7O3w3P2nJUUJY6nAiz53kjeQ== X-Received: by 2002:a17:907:270f:b0:a1e:a558:748c with SMTP id w15-20020a170907270f00b00a1ea558748cmr773894ejk.18.1702036411845; Fri, 08 Dec 2023 03:53:31 -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 g6-20020a056402090600b0054c9211021csm712424edz.69.2023.12.08.03.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 03:53:31 -0800 (PST) Message-ID: <9fc90ad975d9a3e5180259ec29a62013a4d16d17.1702036387.git.liliana.prikler@gmail.com> In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 8 Dec 2023 12:45:23 +0100 Subject: [PATCH v4 5/5] gnu: emacs-magit: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 3.1 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (3.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:544 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:544 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 3.1 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 80b3136284..1655dee647 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1566,7 +1566,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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 27 06:00:30 2023 Received: (at 67260) by debbugs.gnu.org; 27 Dec 2023 11:00:30 +0000 Received: from localhost ([127.0.0.1]:35425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIReG-0001qG-3u for submit@debbugs.gnu.org; Wed, 27 Dec 2023 06:00:30 -0500 Received: from out-177.mta1.migadu.com ([2001:41d0:203:375::b1]:60691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIReC-0001bo-Fe for 67260@debbugs.gnu.org; Wed, 27 Dec 2023 06:00:27 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1703674823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=KwQVTLtYgAi2RgnplI7M3SXiCCnhWLmZUS9SlqMQlpo=; b=aet62vEH7ul03Fm+XtKGFGTFTWw0fBydnH22RLoj8dTqD3BI3M4bac/92NUUqtQ36NCFEI sw1xOhkdzbY75zIad2e4wX8gjWaQ8COoeeEhPNlGFw1LBcPOZwJuXEYnabNn+bp5O2sTxU WqX3Hx7z036PJUULWbQWs79gdhQcRVnzgmXcztWBQ41VEyxuPJ/q6QEk6WKGtPGy3YQBR1 xJeWv7s67e7aYJWSDgpjDsmKxnP3ScnsaM6aMDjuMT6mopHIWsRpEv61NZJ5UgY8JSU54W zfyCTxHYaLJl0l7hOmH2RLI4EChHMolekeT/Yfj4OF5prdjQ7mGHngema2g26w== From: Andrew Tropin To: Liliana Marie Prikler , 67260@debbugs.gnu.org Subject: Re: [PATCH v4 1/5] gnu: emacs: Build trampolines. In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> Date: Wed, 27 Dec 2023 14:00:15 +0300 Message-ID: <87le9fzz9c.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-11-25 12:13, Liliana Marie Prikler wrote: > * gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add =E2=80=98build-tramp= olines=E2=80=99. > > 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 b9d9e2b891..55eab48c25 100644 > --- a/gnu/packages/emacs.scm > +++ b/gnu/packages/emacs.scm > @@ -327,7 +327,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 > > base-commit: 60c97924e9519361494aaf0686e28eb831a42315 Applied the patch series v4 to emacs-team branch, removed all eln files in ~/.cache/emacs and ~/.config/emacs, executed =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env guix shell emacs-pgtk emacs-magit \ =2D-pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q # M-S-: (require 'magit) RET =2D-8<---------------cut here---------------end--------------->8--- *Warnings*: =2D-8<---------------cut here---------------start------------->8--- ... # the same content as in the listing below + =E2=9B=94 Warning (comp): /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs= -pgtk-29.1/share/emacs/29.1/lisp/emacs-lisp/eieio.el.gz: Error: error Uncom= pression program `sh' not found =E2=9B=94 Warning (comp): /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs= -pgtk-29.1/share/emacs/29.1/lisp/emacs-lisp/comp.el.gz: Error: error Uncomp= ression program `sh' not found ... =2D-8<---------------cut here---------------end--------------->8--- Modified the command =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env guix shell emacs-pgtk emacs-magit bash \ =2D-pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q # M-S-: (require 'magit) RET =2D-8<---------------cut here---------------end--------------->8--- *Warnings*: =2D-8<---------------cut here---------------start------------->8--- =E2=9B=94 Warning (comp): dash.el:615:2: Warning: docstring wider than 80 c= haracters =E2=9B=94 Warning (comp): dash.el:628:2: Warning: docstring wider than 80 c= haracters =E2=9B=94 Warning (comp): dash.el:645:2: Warning: docstring wider than 80 c= haracters =E2=9B=94 Warning (comp): dash.el:1059:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:1219:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:1272:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:1320:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:1335:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:1341:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:1523:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:2254:2: Warning: docstring has wrong usag= e of unescaped single quotes (use \=3D or different quoting) =E2=9B=94 Warning (comp): dash.el:2613:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:2632:2: Warning: docstring wider than 80 = characters =E2=9B=94 Warning (comp): dash.el:3318:2: Warning: docstring wider than 80 = characters =2D-8<---------------cut here---------------end--------------->8--- *Native-compile-log*: =2D-8<---------------cut here---------------start------------->8--- Compiling /home/bob/.config/emacs/eln-cache/29.1-5c9913f6/subr--trampoline-= 6d616b652d70726f63657373_make_process_0.eln... =2D-8<---------------cut here---------------end--------------->8--- *Async-native-compile-log*: =2D-8<---------------cut here---------------start------------->8--- Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/bytecomp.el.gz... uncompressing bytecomp.el.gz... uncompressing bytecomp.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-extra.el.gz... uncompressing cl-extra.el.gz... uncompressing cl-extra.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-loaddefs.el.gz... uncompressing cl-loaddefs.el.gz... uncompressing cl-loaddefs.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-lib.el.gz... uncompressing cl-lib.el.gz... uncompressing cl-lib.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/help-mode.el.gz... uncompressing help-mode.el.gz... uncompressing help-mode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/gv.el.gz... uncompressing gv.el.gz... uncompressing gv.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-macs.el.gz... uncompressing cl-macs.el.gz... uncompressing cl-macs.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-seq.el.gz... uncompressing cl-seq.el.gz... uncompressing cl-seq.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/rx.el.gz... uncompressing rx.el.gz... uncompressing rx.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/subr-x.el.gz... uncompressing subr-x.el.gz... uncompressing subr-x.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/icons.el.gz... uncompressing icons.el.gz... uncompressing icons.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/warnings.el.gz... uncompressing warnings.el.gz... uncompressing warnings.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/comp-cstr.el.gz... uncompressing comp-cstr.el.gz... uncompressing comp-cstr.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/comp.el.gz... uncompressing comp.el.gz... uncompressing comp.el.gz...done Compiling /gnu/store/zxbk6xmbk8if4r7h0bfwrw5nq925drrb-emacs-dash-2.19.1/sha= re/emacs/site-lisp/dash-2.19.1/dash.el... In -map-when: dash.el:615:2: Warning: docstring wider than 80 characters In -map-first: dash.el:628:2: Warning: docstring wider than 80 characters In -map-last: dash.el:645:2: Warning: docstring wider than 80 characters In -only-some?: dash.el:1059:2: Warning: docstring wider than 80 characters In -update-at: dash.el:1219:2: Warning: docstring wider than 80 characters In -split-with: dash.el:1272:2: Warning: docstring wider than 80 characters In -separate: dash.el:1320:2: Warning: docstring wider than 80 characters In -partition-all-in-steps: dash.el:1335:2: Warning: docstring wider than 80 characters In -partition-in-steps: dash.el:1341:2: Warning: docstring wider than 80 characters In --zip-with: dash.el:1523:2: Warning: docstring wider than 80 characters In -let: dash.el:2254:2: Warning: docstring has wrong usage of unescaped single quot= es (use \=3D or different quoting) In -union: dash.el:2613:2: Warning: docstring wider than 80 characters In -intersection: dash.el:2632:2: Warning: docstring wider than 80 characters In -prodfn: dash.el:3318:2: Warning: docstring wider than 80 characters Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/eieio.el.gz... uncompressing eieio.el.gz... uncompressing eieio.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/eieio-core.el.gz... uncompressing eieio-core.el.gz... uncompressing eieio-core.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/byte-opt.el.gz... uncompressing byte-opt.el.gz... uncompressing byte-opt.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/crm.el.gz... uncompressing crm.el.gz... uncompressing crm.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cursor-sensor.el.gz... uncompressing cursor-sensor.el.gz... uncompressing cursor-sensor.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/format-spec.el.gz... uncompressing format-spec.el.gz... uncompressing format-spec.el.gz...done Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-section.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-base.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-git.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/kmacro.el.gz... uncompressing kmacro.el.gz... uncompressing kmacro.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/edmacro.el.gz... uncompressing edmacro.el.gz... uncompressing edmacro.el.gz...done Compiling /gnu/store/j8ai3gdi0nyhngpid3rxaqhy1a9xp22i-emacs-transient-0.4.3= -0.cc0fa80/share/emacs/site-lisp/transient-0.4.3-0.cc0fa80/transient.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-mode.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/ansi-color.el.gz... uncompressing ansi-color.el.gz... uncompressing ansi-color.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/server.el.gz... uncompressing server.el.gz... uncompressing server.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/ring.el.gz... uncompressing ring.el.gz... uncompressing ring.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/ansi-osc.el.gz... uncompressing ansi-osc.el.gz... uncompressing ansi-osc.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/comint.el.gz... uncompressing comint.el.gz... uncompressing comint.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/pcomplete.el.gz... uncompressing pcomplete.el.gz... uncompressing pcomplete.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/shell.el.gz... uncompressing shell.el.gz... uncompressing shell.el.gz...done Compiling /gnu/store/qy0xb7bikh5bghwqskw5wnylbk7ikjkz-emacs-with-editor-3.3= .2/share/emacs/site-lisp/with-editor-3.3.2/with-editor.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/calendar/time-date.el.gz... uncompressing time-date.el.gz... uncompressing time-date.el.gz...done Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-process.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-transient.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-margin.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/filenotify.el.gz... uncompressing filenotify.el.gz... uncompressing filenotify.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/autorevert.el.gz... uncompressing autorevert.el.gz... uncompressing autorevert.el.gz...done Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-autorevert.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/add-log.el.gz... uncompressing add-log.el.gz... uncompressing add-log.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/pcvs-util.el.gz... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/mailheader.el.gz... uncompressing pcvs-util.el.gz... uncompressing pcvs-util.el.gz...done uncompressing mailheader.el.gz... uncompressing mailheader.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/gmm-utils.el.gz... uncompressing gmm-utils.el.gz... uncompressing gmm-utils.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/mail-utils.el.gz... uncompressing mail-utils.el.gz... uncompressing mail-utils.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/mailabbrev.el.gz... uncompressing mailabbrev.el.gz... uncompressing mailabbrev.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/ietf-drums.el.gz... uncompressing ietf-drums.el.gz... uncompressing ietf-drums.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mm-util.el.gz... uncompressing mm-util.el.gz... uncompressing mm-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc2045.el.gz... uncompressing rfc2045.el.gz... uncompressing rfc2045.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc2047.el.gz... uncompressing rfc2047.el.gz... uncompressing rfc2047.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc2231.el.gz... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/mail-parse.el.gz... uncompressing rfc2231.el.gz... uncompressing rfc2231.el.gz...done uncompressing mail-parse.el.gz... uncompressing mail-parse.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mm-encode.el.gz... uncompressing mm-encode.el.gz... uncompressing mm-encode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mm-bodies.el.gz... uncompressing mm-bodies.el.gz... uncompressing mm-bodies.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mm-decode.el.gz... uncompressing mm-decode.el.gz... uncompressing mm-decode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/text-property-search.el.gz... uncompressing text-property-search.el.gz... uncompressing text-property-search.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/gnus-util.el.gz... uncompressing gnus-util.el.gz... uncompressing gnus-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/epg-config.el.gz... uncompressing epg-config.el.gz... uncompressing epg-config.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc6068.el.gz... uncompressing rfc6068.el.gz... uncompressing rfc6068.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/epg.el.gz... uncompressing epg.el.gz... uncompressing epg.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/derived.el.gz... uncompressing derived.el.gz... uncompressing derived.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/epa.el.gz... uncompressing epa.el.gz... uncompressing epa.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/password-cache.el.gz... uncompressing password-cache.el.gz... uncompressing password-cache.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mml-sec.el.gz... uncompressing mml-sec.el.gz... uncompressing mml-sec.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mml.el.gz... uncompressing mml.el.gz... uncompressing mml.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc822.el.gz... uncompressing rfc822.el.gz... uncompressing rfc822.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/dired.el.gz... uncompressing dired.el.gz... uncompressing dired.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/net/puny.el.gz... uncompressing puny.el.gz... uncompressing puny.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/yank-media.el.gz... uncompressing yank-media.el.gz... uncompressing yank-media.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/net/mailcap.el.gz... uncompressing mailcap.el.gz... uncompressing mailcap.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/sendmail.el.gz... uncompressing sendmail.el.gz... uncompressing sendmail.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/message.el.gz... uncompressing message.el.gz... uncompressing message.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/log-edit.el.gz... uncompressing log-edit.el.gz... uncompressing log-edit.el.gz...done Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/git-commit.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/easy-mmode.el.gz... uncompressing easy-mmode.el.gz... uncompressing easy-mmode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/diff-mode.el.gz... uncompressing diff-mode.el.gz... uncompressing diff-mode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/diff.el.gz... uncompressing diff.el.gz... uncompressing diff.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/smerge-mode.el.gz... uncompressing smerge-mode.el.gz... uncompressing smerge-mode.el.gz...done Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-diff.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/imenu.el.gz... uncompressing imenu.el.gz... uncompressing imenu.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/progmodes/which-func.el.gz... uncompressing which-func.el.gz... uncompressing which-func.el.gz...done Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-log.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-wip.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-apply.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-repos.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-vars.el.gz... uncompressing url-vars.el.gz... uncompressing url-vars.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/map.el.gz... uncompressing map.el.gz... uncompressing map.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/json.el.gz... uncompressing json.el.gz... uncompressing json.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/auth-source.el.gz... uncompressing auth-source.el.gz... uncompressing auth-source.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-parse.el.gz... uncompressing url-parse.el.gz... uncompressing url-parse.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-handlers.el.gz... uncompressing url-handlers.el.gz... uncompressing url-handlers.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-util.el.gz... uncompressing url-util.el.gz... uncompressing url-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-domsuf.el.gz... uncompressing url-domsuf.el.gz... uncompressing url-domsuf.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/generate-lisp-file.el.gz... uncompressing generate-lisp-file.el.gz... uncompressing generate-lisp-file.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-cookie.el.gz... uncompressing url-cookie.el.gz... uncompressing url-cookie.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-history.el.gz... uncompressing url-history.el.gz... uncompressing url-history.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-methods.el.gz... uncompressing url-methods.el.gz... uncompressing url-methods.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-expand.el.gz... uncompressing url-expand.el.gz... uncompressing url-expand.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-privacy.el.gz... uncompressing url-privacy.el.gz... uncompressing url-privacy.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-proxy.el.gz... uncompressing url-proxy.el.gz... uncompressing url-proxy.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url.el.gz... uncompressing url.el.gz... uncompressing url.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/net/browse-url.el.gz... uncompressing browse-url.el.gz... uncompressing browse-url.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/package.el.gz... uncompressing package.el.gz... uncompressing package.el.gz...done Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-status.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-refs.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-files.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-reset.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-branch.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-merge.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-worktree.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-tag.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-notes.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-sequence.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-commit.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-remote.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-clone.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-fetch.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-push.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-pull.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-bisect.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-reflog.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-stash.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-blame.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-submodule.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-patch.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-subtree.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-init.el.gz... uncompressing ediff-init.el.gz... uncompressing ediff-init.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-help.el.gz... uncompressing ediff-help.el.gz... uncompressing ediff-help.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-diff.el.gz... uncompressing ediff-diff.el.gz... uncompressing ediff-diff.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-wind.el.gz... uncompressing ediff-wind.el.gz... uncompressing ediff-wind.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-mult.el.gz... uncompressing ediff-mult.el.gz... uncompressing ediff-mult.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-merg.el.gz... uncompressing ediff-merg.el.gz... uncompressing ediff-merg.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-util.el.gz... uncompressing ediff-util.el.gz... uncompressing ediff-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff.el.gz... uncompressing ediff.el.gz... uncompressing ediff.el.gz...done Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-ediff.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-gitignore.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-sparse-checkout.el= ... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-extras.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/git-rebase.el... Compiling /gnu/store/bz2lz2pf5il825aqcsadafpshhd224d2-emacs-magit-3.3.0-6.7= a1d503/share/emacs/site-lisp/magit-3.3.0-6.7a1d503/magit-bookmark.el... Compilation finished. =2D-8<---------------cut here---------------end--------------->8--- In either cases ~/.config/emacs/eln-cache get populated: =2D-8<---------------cut here---------------start------------->8--- ls ~/.config/emacs/eln-cache/29.1-5c9913f6 -1=20 calendar/ dash.eln emacs-lisp/ git-commit.eln git-rebase.eln gnus/ magit-apply.eln magit-autorevert.eln magit-base.eln magit-bisect.eln magit-blame.eln magit-bookmark.eln magit-branch.eln magit-clone.eln magit-commit.eln magit-diff.eln magit-ediff.eln magit.eln magit-extras.eln magit-fetch.eln magit-files.eln magit-git.eln magit-gitignore.eln magit-log.eln magit-margin.eln magit-merge.eln magit-mode.eln magit-notes.eln magit-patch.eln magit-process.eln magit-pull.eln magit-push.eln magit-reflog.eln magit-refs.eln magit-remote.eln magit-repos.eln magit-reset.eln magit-section.eln magit-sequence.eln magit-sparse-checkout.eln magit-stash.eln magit-status.eln magit-submodule.eln magit-subtree.eln magit-tag.eln magit-transient.eln magit-wip.eln magit-worktree.eln mail/ net/ progmodes/ subr--trampoline-6d616b652d70726f63657373_make_process_0.eln transient.eln url/ vc/ with-editor.eln =2D-8<---------------cut here---------------end--------------->8--- =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmWMA78ACgkQIgjSCVjB 3rBmtQ//SCKRd7DW+YVx3o1GeMNQZS0AhQqIjlTTKbt67WkQIOcOr2ax/dRa9Xhv eVoEjxB3zXhE9bgy3qkDGDgzm7p98+F2RQQiqS0fUhjaTnJv39ROPv7J0WIp2QVO eEsW87TAX0mQf2+jeQyAE9xjougoxxPcMy4INtrUUWt03XCIXeWK35LWuGJmjiNF mG2CijwJxLwx5WgyWJENFY8HncQ88EZdq7f81ivMALNUd/qJZ1RMrJOAIljZnfzY 4Fht1ikDWHRqDCtfrV9Sy6J3tiHuWVIQ3nB/dSVGJD/W4VnwHHJiksQJ7UO1CBp1 TP6eDFcohYt/4xkB6DOgrmNwYaY3+j0OxBfX87Kn5JBjD7VszlWyn59EVp9EpPeb md+mq4DLnQq0iln1iXXQYN4pyRcnJFzcYPhTpPtn+DJPzoiWz4eVmI7Eg3VPyDgk rC4t6/p1adQGWSfH2zNTo0X4q4LTewNxACRRO9zGpKkLszCCt+8Ts0kTmQ+EeoY5 MAaZIAlFePfjdN/hmgp+uBjdqUHyqIlT/gdS/f4jfgnKCYN/d/qdWgN1Lbmh7rrH JrjJMditWlK00JrLHrQtQ4dqBWxjnIZKzCd4g78d+lmxdMhhn0HK6pYnnMGBy1Ur LPf5jbv+tkdh1mlnCX7+XtoHk2JdqR4vCr2B/oKT7o9zoxLE5yU= =TjG2 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 27 11:40:33 2023 Received: (at 67260) by debbugs.gnu.org; 27 Dec 2023 16:40:33 +0000 Received: from localhost ([127.0.0.1]:37656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIWxM-0002Ww-N2 for submit@debbugs.gnu.org; Wed, 27 Dec 2023 11:40:33 -0500 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]:55591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIWxK-0002Wh-LJ for 67260@debbugs.gnu.org; Wed, 27 Dec 2023 11:40:31 -0500 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-50e759ece35so2776225e87.3 for <67260@debbugs.gnu.org>; Wed, 27 Dec 2023 08:40:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703695225; x=1704300025; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=zbWnSAWTwTAJBm4eY7JCHRVM0LUqEjAWUeTWAZm73Z8=; b=Nt9k+ArcVdDsW4a2YgWxk7XUVyA069Z57D/ei3R6BuoYfLYiIzWFkhVRtPS+t612nk 4mhPi1H622I1dwr+Uvkt1dhzIspj7VofxbhD86sHS2qMJ1/IWfuSEO5xa6rKVeI/T5nM u5PlQkHMWzrtiKjwyCIYiX0orymvzTwvGaYls3J+splE1cEz739eKipn9PtcU3cRjBND qcTNI6cCDICo21ScFqU6unGwz7BoIDqYOW1jK68UEwr1HIiuq4JCj7kY/A1XfDjBuJDs GaNoif+zmHfKI3SgYXZVtzQi8/fZt/V5vltgG35ecDMIPwzFBmJNutuvTMDiVu1Pi+7V Yscw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703695225; x=1704300025; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=zbWnSAWTwTAJBm4eY7JCHRVM0LUqEjAWUeTWAZm73Z8=; b=q8l+gq0Q7gXxHz0rY/WsoHAVPspb4GuWfgtHJKqJcTof6sPiSvIvJElmY4psUJx478 Xl+bPJ5Dvev9zckN0M75+wB9Kf/Nxoelp4wYZlbBgQ5Qec4I8YJTuPOpTmWwYdIblc1M 0KxbJr1k62JkfdgXm9uCxm+qXt4PRn5nbJsSMUQvUe8/07z9YIpjb20+7q/cYh5wZrG7 FHq/toq/MLuGQEY35BblJEcsrCOAucvxcH9f/w+gaIjiuYV3jYsHTvelE4kuoaOfX3et vXnclRJEdzoistXI1RdUaCZ19/n2JW30aTh4i6Tb2Mitjqo7sewo7Z54Ku/ewlvHtB/w nlxg== X-Gm-Message-State: AOJu0Yxlt03GeLYZuj7v1IzaUPWkNx/RvM94HTch9+JWv7EwZGrWoIKw S3gCjHEzSM7/oU6sw45MUy8= X-Google-Smtp-Source: AGHT+IERqkp1ktP2PoLLpBlMtrj3V1yrjvETUX0M9mH3dM1uFfKNq61RZ71jdHTHMptnifyi2SwLhw== X-Received: by 2002:ac2:55ad:0:b0:50b:f7fc:ac5 with SMTP id y13-20020ac255ad000000b0050bf7fc0ac5mr2761431lfg.97.1703695225179; Wed, 27 Dec 2023 08:40:25 -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 w25-20020a170906481900b00a26ac253486sm6068738ejq.134.2023.12.27.08.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 08:40:24 -0800 (PST) Message-ID: Subject: Re: [PATCH v4 1/5] gnu: emacs: Build trampolines. From: Liliana Marie Prikler To: Andrew Tropin , 67260@debbugs.gnu.org Date: Wed, 27 Dec 2023 17:40:22 +0100 In-Reply-To: <87le9fzz9c.fsf@trop.in> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> <87le9fzz9c.fsf@trop.in> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 27.12.2023 um 14:00 +0300 schrieb Andrew Tropin: > On 2023-11-25 12:13, Liliana Marie Prikler wrote: >=20 > > * gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add =E2=80=98build- > > trampolines=E2=80=99. > >=20 > > Change-Id: I33303bcbaf6cbda15867a5546e793c05d1f0e67b > > --- > > =C2=A0gnu/packages/emacs.scm | 5 ++++- > > =C2=A01 file changed, 4 insertions(+), 1 deletion(-) > >=20 > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > > index b9d9e2b891..55eab48c25 100644 > > --- a/gnu/packages/emacs.scm > > +++ b/gnu/packages/emacs.scm > > @@ -327,7 +327,10 @@ (define-public emacs-no-x > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-pack= age-input "libgccjit") > > "/lib/") > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-package-in= put "libgccjit") > > "/lib/gcc/")))))))))) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-package-in= put "libgccjit") > > "/lib/gcc/")))))) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (ad= d-after 'build 'build-trampolines > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 (lambda* (#:key make-flags #:allow-other-keys) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (apply invoke "make" "trampolines" make- > > flags))))))) > > =C2=A0=C2=A0=C2=A0=C2=A0 (inputs > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (modify-inputs (package-inputs emacs-min= imal) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (prepend gnutls > >=20 > > base-commit: 60c97924e9519361494aaf0686e28eb831a42315 >=20 > Applied the patch series v4 to emacs-team branch, removed all eln > files > in ~/.cache/emacs and ~/.config/emacs, executed >=20 > --8<---------------cut here---------------start------------->8--- > ./pre-inst-env guix shell emacs-pgtk emacs-magit \ > --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q > # M-S-: (require 'magit) RET > --8<---------------cut here---------------end--------------->8--- You're missing --with-input=3Demacs-minimal=3Demacs. You are not natively compiling emacs-magit atm. Cheers From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 27 13:27:57 2023 Received: (at 67260) by debbugs.gnu.org; 27 Dec 2023 18:27:57 +0000 Received: from localhost ([127.0.0.1]:37753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIYdI-0007JC-IX for submit@debbugs.gnu.org; Wed, 27 Dec 2023 13:27:57 -0500 Received: from out-176.mta0.migadu.com ([2001:41d0:1004:224b::b0]:20386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIYdF-0007Iz-2f for 67260@debbugs.gnu.org; Wed, 27 Dec 2023 13:27:55 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1703701672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=XBzJ1UyMdPhuI1QLFTJCkB6dJJ13PhFSjf8NJB06sEE=; b=bn4fo6tvsP89yiiXOxJt9yKcKbj9pwfhWmwF9dMt+x5fzBBcaSFfBRTBc85IWdYZ3MGNYW PEhanhcYIMPVTDRhg+CiCQ6AKg7XxuGu0gBRnMdrWWqTGKTG+3yVKWdlvTGCjAh+WBRwJw HwoUy7RO0dY/gdDWmitScAUJInnZ65Z+o5aTt8fpf6fcA6/wxe4COj/xGCU7wL41SkdB5S C3mHbiwbEM9Vf/2ax8UcEnGtYRrvxA17BNYXTKLta1SY5YL7RChRFUIXOAIQLQUXaiGDNz LUyudVHrKtiojQD0tIFCbI7cTgbaNrQ/rNpPPS15egUvOr8xoTQpu2NWv3BhYA== From: Andrew Tropin To: Liliana Marie Prikler , 67260@debbugs.gnu.org Subject: Re: [PATCH v4 1/5] gnu: emacs: Build trampolines. In-Reply-To: References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> <87le9fzz9c.fsf@trop.in> Date: Wed, 27 Dec 2023 21:27:47 +0300 Message-ID: <87wmszfql8.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-12-27 17:40, Liliana Marie Prikler wrote: > Am Mittwoch, dem 27.12.2023 um 14:00 +0300 schrieb Andrew Tropin: >> On 2023-11-25 12:13, Liliana Marie Prikler wrote: >>=20 >> > * gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add =E2=80=98build- >> > trampolines=E2=80=99. >> >=20 >> > Change-Id: I33303bcbaf6cbda15867a5546e793c05d1f0e67b >> > --- >> > =C2=A0gnu/packages/emacs.scm | 5 ++++- >> > =C2=A01 file changed, 4 insertions(+), 1 deletion(-) >> >=20 >> > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm >> > index b9d9e2b891..55eab48c25 100644 >> > --- a/gnu/packages/emacs.scm >> > +++ b/gnu/packages/emacs.scm >> > @@ -327,7 +327,10 @@ (define-public emacs-no-x >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-pack= age-input "libgccjit") >> > "/lib/") >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append >> > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-package-in= put "libgccjit") >> > "/lib/gcc/")))))))))) >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-package-in= put "libgccjit") >> > "/lib/gcc/")))))) >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (a= dd-after 'build 'build-trampolines >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 (lambda* (#:key make-flags #:allow-other-keys) >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (apply invoke "make" "trampolines" make- >> > flags))))))) >> > =C2=A0=C2=A0=C2=A0=C2=A0 (inputs >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (modify-inputs (package-inputs emacs-mi= nimal) >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (prepend gnutls >> >=20 >> > base-commit: 60c97924e9519361494aaf0686e28eb831a42315 >>=20 >> Applied the patch series v4 to emacs-team branch, removed all eln >> files >> in ~/.cache/emacs and ~/.config/emacs, executed >>=20 >> --8<---------------cut here---------------start------------->8--- >> ./pre-inst-env guix shell emacs-pgtk emacs-magit \ >> --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q >> # M-S-: (require 'magit) RET >> --8<---------------cut here---------------end--------------->8--- > You're missing --with-input=3Demacs-minimal=3Demacs. You are not natively > compiling emacs-magit atm. Right, thank you! =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env guix shell bash emacs-pgtk emacs-magit \ =2D-with-input=3Demacs-minimal=3Demacs-pgtk --pure \ =2DE '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q =2D-8<---------------cut here---------------end--------------->8--- *Native-compile-log*: =2D-8<---------------cut here---------------start------------->8--- Compiling /home/bob/.config/emacs/eln-cache/29.1-5c9913f6/subr--trampoline-= 6d616b652d70726f63657373_make_process_0.eln... =2D-8<---------------cut here---------------end--------------->8--- *Async-native-compile-log*: =2D-8<---------------cut here---------------start------------->8--- Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/bytecomp.el.gz... uncompressing bytecomp.el.gz... uncompressing bytecomp.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-extra.el.gz... uncompressing cl-extra.el.gz... uncompressing cl-extra.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-loaddefs.el.gz... uncompressing cl-loaddefs.el.gz... uncompressing cl-loaddefs.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-lib.el.gz... uncompressing cl-lib.el.gz... uncompressing cl-lib.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/help-mode.el.gz... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/gv.el.gz... uncompressing help-mode.el.gz... uncompressing help-mode.el.gz...done uncompressing gv.el.gz... uncompressing gv.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-macs.el.gz... uncompressing cl-macs.el.gz... uncompressing cl-macs.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cl-seq.el.gz... uncompressing cl-seq.el.gz... uncompressing cl-seq.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/rx.el.gz... uncompressing rx.el.gz... uncompressing rx.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/subr-x.el.gz... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/icons.el.gz... uncompressing subr-x.el.gz... uncompressing subr-x.el.gz...done uncompressing icons.el.gz... uncompressing icons.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/warnings.el.gz... uncompressing warnings.el.gz... uncompressing warnings.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/comp-cstr.el.gz... uncompressing comp-cstr.el.gz... uncompressing comp-cstr.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/comp.el.gz... uncompressing comp.el.gz... uncompressing comp.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/eieio.el.gz... uncompressing eieio.el.gz... uncompressing eieio.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/eieio-core.el.gz... uncompressing eieio-core.el.gz... uncompressing eieio-core.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/byte-opt.el.gz... uncompressing byte-opt.el.gz... uncompressing byte-opt.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/crm.el.gz... uncompressing crm.el.gz... uncompressing crm.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/cursor-sensor.el.gz... uncompressing cursor-sensor.el.gz... uncompressing cursor-sensor.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/format-spec.el.gz... uncompressing format-spec.el.gz... uncompressing format-spec.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/kmacro.el.gz... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/edmacro.el.gz... uncompressing kmacro.el.gz... uncompressing kmacro.el.gz...done uncompressing edmacro.el.gz... uncompressing edmacro.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/ansi-color.el.gz... uncompressing ansi-color.el.gz... uncompressing ansi-color.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/server.el.gz... uncompressing server.el.gz... uncompressing server.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/ring.el.gz... uncompressing ring.el.gz... uncompressing ring.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/ansi-osc.el.gz... uncompressing ansi-osc.el.gz... uncompressing ansi-osc.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/comint.el.gz... uncompressing comint.el.gz... uncompressing comint.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/pcomplete.el.gz... uncompressing pcomplete.el.gz... uncompressing pcomplete.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/shell.el.gz... uncompressing shell.el.gz... uncompressing shell.el.gz...done Compiling /gnu/store/6i4g4pn4nl2zka6771i4zr9ljxrxlbyj-emacs-with-editor-3.3= .2/share/emacs/site-lisp/with-editor-3.3.2/with-editor.el... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/calendar/time-date.el.gz... uncompressing time-date.el.gz... uncompressing time-date.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/filenotify.el.gz... uncompressing filenotify.el.gz... uncompressing filenotify.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/autorevert.el.gz... uncompressing autorevert.el.gz... uncompressing autorevert.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/add-log.el.gz... uncompressing add-log.el.gz... uncompressing add-log.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/pcvs-util.el.gz... uncompressing pcvs-util.el.gz... uncompressing pcvs-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/mailheader.el.gz... uncompressing mailheader.el.gz... uncompressing mailheader.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/gmm-utils.el.gz... uncompressing gmm-utils.el.gz... uncompressing gmm-utils.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/mail-utils.el.gz... uncompressing mail-utils.el.gz... uncompressing mail-utils.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/mailabbrev.el.gz... uncompressing mailabbrev.el.gz... uncompressing mailabbrev.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/ietf-drums.el.gz... uncompressing ietf-drums.el.gz... uncompressing ietf-drums.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mm-util.el.gz... uncompressing mm-util.el.gz... uncompressing mm-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc2045.el.gz... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc2047.el.gz... uncompressing rfc2045.el.gz... uncompressing rfc2045.el.gz...done uncompressing rfc2047.el.gz... uncompressing rfc2047.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc2231.el.gz... uncompressing rfc2231.el.gz... uncompressing rfc2231.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/mail-parse.el.gz... uncompressing mail-parse.el.gz... uncompressing mail-parse.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mm-encode.el.gz... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mm-bodies.el.gz... uncompressing mm-encode.el.gz... uncompressing mm-encode.el.gz...done uncompressing mm-bodies.el.gz... uncompressing mm-bodies.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mm-decode.el.gz... uncompressing mm-decode.el.gz... uncompressing mm-decode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/text-property-search.el.gz... uncompressing text-property-search.el.gz... uncompressing text-property-search.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/gnus-util.el.gz... uncompressing gnus-util.el.gz... uncompressing gnus-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/epg-config.el.gz... uncompressing epg-config.el.gz... uncompressing epg-config.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc6068.el.gz... uncompressing rfc6068.el.gz... uncompressing rfc6068.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/epg.el.gz... uncompressing epg.el.gz... uncompressing epg.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/derived.el.gz... uncompressing derived.el.gz... uncompressing derived.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/epa.el.gz... uncompressing epa.el.gz... uncompressing epa.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/password-cache.el.gz... uncompressing password-cache.el.gz... uncompressing password-cache.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mml-sec.el.gz... uncompressing mml-sec.el.gz... uncompressing mml-sec.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/mml.el.gz... uncompressing mml.el.gz... uncompressing mml.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/rfc822.el.gz... uncompressing rfc822.el.gz... uncompressing rfc822.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/dired.el.gz... uncompressing dired.el.gz... uncompressing dired.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/net/puny.el.gz... uncompressing puny.el.gz... uncompressing puny.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/yank-media.el.gz... uncompressing yank-media.el.gz... uncompressing yank-media.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/net/mailcap.el.gz... uncompressing mailcap.el.gz... uncompressing mailcap.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/mail/sendmail.el.gz... Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/gnus/message.el.gz... uncompressing sendmail.el.gz... uncompressing sendmail.el.gz...done uncompressing message.el.gz... uncompressing message.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/log-edit.el.gz... uncompressing log-edit.el.gz... uncompressing log-edit.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/easy-mmode.el.gz... uncompressing easy-mmode.el.gz... uncompressing easy-mmode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/diff-mode.el.gz... uncompressing diff-mode.el.gz... uncompressing diff-mode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/diff.el.gz... uncompressing diff.el.gz... uncompressing diff.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/smerge-mode.el.gz... uncompressing smerge-mode.el.gz... uncompressing smerge-mode.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/imenu.el.gz... uncompressing imenu.el.gz... uncompressing imenu.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/progmodes/which-func.el.gz... uncompressing which-func.el.gz... uncompressing which-func.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-vars.el.gz... uncompressing url-vars.el.gz... uncompressing url-vars.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/map.el.gz... uncompressing map.el.gz... uncompressing map.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/json.el.gz... uncompressing json.el.gz... uncompressing json.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/auth-source.el.gz... uncompressing auth-source.el.gz... uncompressing auth-source.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-parse.el.gz... uncompressing url-parse.el.gz... uncompressing url-parse.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-handlers.el.gz... uncompressing url-handlers.el.gz... uncompressing url-handlers.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-util.el.gz... uncompressing url-util.el.gz... uncompressing url-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-domsuf.el.gz... uncompressing url-domsuf.el.gz... uncompressing url-domsuf.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/generate-lisp-file.el.gz... uncompressing generate-lisp-file.el.gz... uncompressing generate-lisp-file.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-cookie.el.gz... uncompressing url-cookie.el.gz... uncompressing url-cookie.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-history.el.gz... uncompressing url-history.el.gz... uncompressing url-history.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-methods.el.gz... uncompressing url-methods.el.gz... uncompressing url-methods.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-expand.el.gz... uncompressing url-expand.el.gz... uncompressing url-expand.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-privacy.el.gz... uncompressing url-privacy.el.gz... uncompressing url-privacy.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url-proxy.el.gz... uncompressing url-proxy.el.gz... uncompressing url-proxy.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/url/url.el.gz... uncompressing url.el.gz... uncompressing url.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/net/browse-url.el.gz... uncompressing browse-url.el.gz... uncompressing browse-url.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/emacs-lisp/package.el.gz... uncompressing package.el.gz... uncompressing package.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-init.el.gz... uncompressing ediff-init.el.gz... uncompressing ediff-init.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-help.el.gz... uncompressing ediff-help.el.gz... uncompressing ediff-help.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-diff.el.gz... uncompressing ediff-diff.el.gz... uncompressing ediff-diff.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-wind.el.gz... uncompressing ediff-wind.el.gz... uncompressing ediff-wind.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-mult.el.gz... uncompressing ediff-mult.el.gz... uncompressing ediff-mult.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-merg.el.gz... uncompressing ediff-merg.el.gz... uncompressing ediff-merg.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff-util.el.gz... uncompressing ediff-util.el.gz... uncompressing ediff-util.el.gz...done Compiling /gnu/store/8nxkj4291ijn4sscvmqysbf4scg0fvil-emacs-pgtk-29.1/share= /emacs/29.1/lisp/vc/ediff.el.gz... uncompressing ediff.el.gz... uncompressing ediff.el.gz...done Compilation finished. =2D-8<---------------cut here---------------end--------------->8--- =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmWMbKMACgkQIgjSCVjB 3rABgA//b5FPMGvOZo2qttqi7H2etfn4JheQCsT/droxhAZ6nS++OyXBfyPd+ick 5VtikS9ltYBNYMa+NbpGo8FBGIuEmUkv10CzeYUuPFN94MMjhVO7taEO3lKaNLwo SCBGgX5p4ykCz/XytdCLhNbtAJf1Kcbf2c+mkz06PkKfxJvW/4IREv1tqbaDeMFo 4q0AV9hKxAnyFonjr4HrmH5QetZDX8vGVUU/kE9/MAelMUhP0ub+b/J3ciep7Byr lC85tWE6NcLTEjFSub9r+UXn4V1mih4S1V3NaHOykZrliAgS+O8mVkok8hazvFmQ KcWayP9L/B8pFNMcbbHM4WI0PJfix7adTakDKbe90KnD0KildUTr4SmGIEkxFORq y6ySpxpTxe3wAhWeOSiHk457d0WGhW2NnNPoLqKR48GP8vYAFIhyNsEEZF4bani/ RoJY/JbPG/ZEFaI8J001p5WQXf01O0HpiZe9zP15qfqkXf48Xjx0ImasPcF7BVYs q5uyag9xA/sTQ/wed3qXruBa8xg+WehHtkiKyEDq2IYrtQ+bITTQ9brk/nn9gETM 4cKVIUcXkAYS5gekwLZ56r99ZH4tq1uRsttg3I/43VVMmGAVVKlsHqdXUWTflwDE j8ZYVv3cXD6na2budNpSu4N7mUmByehGIo/WqrwdUBe+E740Mjg= =PUy8 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 27 15:03:28 2023 Received: (at 67260) by debbugs.gnu.org; 27 Dec 2023 20:03:28 +0000 Received: from localhost ([127.0.0.1]:37789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIa7k-0003GO-Af for submit@debbugs.gnu.org; Wed, 27 Dec 2023 15:03:28 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:51397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIa7h-0003GA-Ok for 67260@debbugs.gnu.org; Wed, 27 Dec 2023 15:03:26 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a271a28aeb4so158139566b.2 for <67260@debbugs.gnu.org>; Wed, 27 Dec 2023 12:03:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703707401; x=1704312201; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=T5wIV+/sbhZKa0FaVSk0PlwJODa6H8no9x6U4vCq8YQ=; b=PH+sEZobG+wfDWT5nkb0mV+28q58gjkpZLVfv7MYUOFx5ONGvkfEFbKtLc9PxO3UzP 8x9pCodLe4++295R2dWsf8IJY4mr2CiDDPkGGHVp7QqvkxO6egA6m+ZnPrCH+qCsnAHH AswdJyVbPT0sYekevvOiDGoIoB3D65l9sbE/54qJNkIfGYjZFUr0dwqWZGbDnoU/bfKM dqg5mTnoVlsr9cl3LphuJERGqbunhM5Lsj1xZAr6gDPTZ6IXC4bWpy/9i4c1cmnIuhZG pGkg6iUlGmxVbQrjAuyIyFwTGFjbT3Xxzne5Aq9kKgafj2wSnIYigjMBMJHbDulFLEJs HqZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703707401; x=1704312201; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=T5wIV+/sbhZKa0FaVSk0PlwJODa6H8no9x6U4vCq8YQ=; b=UqK0EAev7l8c7p+/bdpxeQtoyFrRnwHo4GL04GKTfjVLf3J5tLMfZbtQbFKfsZA4ly /UBdy78zqis3om3DDmNS8S0sO3ro+j3bpiamH8/MkPJxE0xKNVQIgeYwLw7gwOkXXlQX gtTj1uZaLgulMpZitVxj+mWbkOeDkEr+lSFy2+Ug0kFBPckpgSbio4TU7/pGdirXcTUM i+bLwp6X5LXNiSFY0PN4vwV8Ch53ho2ltyVaesSMVViMb1cBx7UXofFTOoK4QxKx8+bK /UV4xD0ZmYIxrcIFmzm4h/HViKpTAkEBz1H6o5ICAk3fQJDTZoDgafzfc6I3CwA3FdLZ zG8g== X-Gm-Message-State: AOJu0Yx1mwqI3b88xlCegFk2SLHNzlGcqOHUnPEx0kF5GXt47240nncC gWo+Ii8MRuJg+W8Vf/sNUcA= X-Google-Smtp-Source: AGHT+IEjG3V4bne6C4x4SDJjdheN2iMo4Oli29hsrfASX5Q+stm8xJfgFkak9bE5Cm7WF3Zl0Y7T+Q== X-Received: by 2002:a17:907:9706:b0:a27:59f9:6858 with SMTP id jg6-20020a170907970600b00a2759f96858mr593606ejc.63.1703707400667; Wed, 27 Dec 2023 12:03:20 -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 d17-20020a170906175100b00a235b01886dsm6916772eje.10.2023.12.27.12.03.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 12:03:19 -0800 (PST) Message-ID: <8269b690abfe4011b01a59d35f24a5b6ca938f29.camel@gmail.com> Subject: Re: [PATCH v4 1/5] gnu: emacs: Build trampolines. From: Liliana Marie Prikler To: Andrew Tropin , 67260@debbugs.gnu.org Date: Wed, 27 Dec 2023 21:03:15 +0100 In-Reply-To: <87wmszfql8.fsf@trop.in> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> <87le9fzz9c.fsf@trop.in> <87wmszfql8.fsf@trop.in> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 27.12.2023 um 21:27 +0300 schrieb Andrew Tropin: > On 2023-12-27 17:40, Liliana Marie Prikler wrote: >=20 > > Am Mittwoch, dem 27.12.2023 um 14:00 +0300 schrieb Andrew Tropin: > > > On 2023-11-25 12:13, Liliana Marie Prikler wrote: > > >=20 > > > > * gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add =E2=80=98build= - > > > > trampolines=E2=80=99. > > > >=20 > > > > Change-Id: I33303bcbaf6cbda15867a5546e793c05d1f0e67b > > > > --- > > > > =C2=A0gnu/packages/emacs.scm | 5 ++++- > > > > =C2=A01 file changed, 4 insertions(+), 1 deletion(-) > > > >=20 > > > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > > > > index b9d9e2b891..55eab48c25 100644 > > > > --- a/gnu/packages/emacs.scm > > > > +++ b/gnu/packages/emacs.scm > > > > @@ -327,7 +327,10 @@ (define-public emacs-no-x > > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append > > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-p= ackage-input "libgccjit") > > > > "/lib/") > > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-package= -input "libgccjit") > > > > "/lib/gcc/")))))))))) > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-package= -input "libgccjit") > > > > "/lib/gcc/")))))) > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= (add-after 'build 'build-trampolines > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (lambda* (#:key make-flags #:allow-other-keys) > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 (apply invoke "make" "trampolines" make- > > > > flags))))))) > > > > =C2=A0=C2=A0=C2=A0=C2=A0 (inputs > > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (modify-inputs (package-inputs emacs= -minimal) > > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (prepend gnutls > > > >=20 > > > > base-commit: 60c97924e9519361494aaf0686e28eb831a42315 > > >=20 > > > Applied the patch series v4 to emacs-team branch, removed all eln > > > files > > > in ~/.cache/emacs and ~/.config/emacs, executed > > >=20 > > > --8<---------------cut here---------------start------------->8--- > > > ./pre-inst-env guix shell emacs-pgtk emacs-magit \ > > > --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q > > > # M-S-: (require 'magit) RET > > > --8<---------------cut here---------------end--------------->8--- > > You're missing --with-input=3Demacs-minimal=3Demacs.=C2=A0 You are not > > natively compiling emacs-magit atm. >=20 > Right, thank you! Turns out you also need to do this with emacs-no-x due to emacs-libgit. Friendly reminder that we don't have build system/packaging utilities to easily replace emacs versions yet, so magit might not have been the wisest choice to showcase here. More worryingly, it appears you're recompiling Emacs itself here. This should not be happening. However, it turns out that your eln-cache is always first on the native load path and thus already compiled files won't be found.=C2=B9 Try adding=C2=A0 --eval=3D'(setq native-comp-jit-compilation nil)' and see whether you can load natively compiled procedures and have them show as natively compiled. Cheers =C2=B9 Maybe there's a smarter way to locate them files? Did I go wrong in one of my patches? From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 27 15:45:05 2023 Received: (at 67260) by debbugs.gnu.org; 27 Dec 2023 20:45:05 +0000 Received: from localhost ([127.0.0.1]:37846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIam1-0001E1-90 for submit@debbugs.gnu.org; Wed, 27 Dec 2023 15:45:05 -0500 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:56490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIaly-00013a-Hy for 67260@debbugs.gnu.org; Wed, 27 Dec 2023 15:45:03 -0500 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-50e49a0b5caso6099165e87.0 for <67260@debbugs.gnu.org>; Wed, 27 Dec 2023 12:45:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703709898; x=1704314698; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=1r4SaAGWu7hzeVPABPtuwNa3+H00Y/a5ZhuJPGtjP6Y=; b=PLooOoJy+5GLw/lNfwPuydd6njhTy95nqGLMJiWJxmB/H3Mngf8/ALk4mjxak/9mIH Yk5BYNS8CUbuzqlEv+ZofQn+2NIrAVgRmDz49HUAUaQxhm8kDlewq725CqCT2K2pIgfR daV5uk8ChCAUo9sTGMTLUvvrtW/zn5VQJJEdet2QhKOXEmqjlFKkGmKUdwhadEF7aGR8 1s+ksfOMARGBWu4TnBGT91qjjjDCaQ/U38gtrwfOBMqsycC6tGIs3DPzUx/8PHio2qzu DO3H2fRZZfBLfqutlNvsAyYqsrJhPecmH02GSsVHooi3dK05TMD3SFrl8vzSzHttMsgI kmAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703709898; x=1704314698; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1r4SaAGWu7hzeVPABPtuwNa3+H00Y/a5ZhuJPGtjP6Y=; b=XJ/OMFeabchZujoUf7BU6FtBLhSgwnsFlXlw2XyEdltg/T07rR3e3iRCoh7uWDAgzs C89sOOX+SzkcIb/RJVPGkzF42eUgdw3atTIGZBNtTxLqj2z3rfUB4Lw4v+VpVFv9Hs4d gDqTVX23sFMHYaNjg8GOy9qOQumnEp5R+WrFeI2/JtPtx4vOHQrrPaBfkYiT87g7ds4r H0gwMmkI+WgCpnZ3UspAKnq8svULlAmCe4bWY7qTBRzyji+XH81+z6Et71CvSz4GzKJM 9BSWwOGG1qQgPxRow35q67OC08Br1P2I6UkuPCs0xIAtrBbQhoLEy4gGOI4Kw83fWCbn wo/Q== X-Gm-Message-State: AOJu0YxH6KcpOPHgoPy/2o+xM2+Wt6pocES3WkTRqNb4u0fqq/ZBTAqc QuIBwyTa3FwV/1T8JX5buY8= X-Google-Smtp-Source: AGHT+IE/ZZSteNL+g5s3nKRfDepSLotelW54iPPHKwivEpXhOlhY+8AxW0iKCGmYMnfZQgkctnAmVg== X-Received: by 2002:a05:6512:613:b0:50e:4375:712 with SMTP id b19-20020a056512061300b0050e43750712mr3568387lfe.16.1703709897529; Wed, 27 Dec 2023 12:44: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 n4-20020a17090625c400b00a26ae76b165sm6077443ejb.115.2023.12.27.12.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 12:44:56 -0800 (PST) Message-ID: Subject: Re: [PATCH v4 1/5] gnu: emacs: Build trampolines. From: Liliana Marie Prikler To: Andrew Tropin , 67260@debbugs.gnu.org Date: Wed, 27 Dec 2023 21:44:54 +0100 In-Reply-To: <8269b690abfe4011b01a59d35f24a5b6ca938f29.camel@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> <87le9fzz9c.fsf@trop.in> <87wmszfql8.fsf@trop.in> <8269b690abfe4011b01a59d35f24a5b6ca938f29.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 27.12.2023 um 21:03 +0100 schrieb Liliana Marie Prikler: > Turns out you also need to do this with emacs-no-x due to emacs- > libgit. =E2=80=A6 or not, as emacs-libgit is not pulled in by emacs-magit. Still a potential problem, however. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 28 00:56:26 2023 Received: (at 67260) by debbugs.gnu.org; 28 Dec 2023 05:56:26 +0000 Received: from localhost ([127.0.0.1]:38269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIjNZ-0002d5-Rw for submit@debbugs.gnu.org; Thu, 28 Dec 2023 00:56:26 -0500 Received: from out-180.mta0.migadu.com ([91.218.175.180]:10327) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIjNX-0002cu-Ge for 67260@debbugs.gnu.org; Thu, 28 Dec 2023 00:56:24 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1703742983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ekqAfIZZxHbOvMWh0Tnw4wVzlzo9WgzgBWgd3KapKps=; b=cNfB0T8gR5DhExzfO3gHAuhHO3z3zAemkrM7Nq1a7HIyUw5MaXU+ICEhOxUac70l9BI4aK 9jHLNrfrtwhS/R4YDz1BgSBTDCPtKiifedURVo0Tp2EJJnTAMOseZ4M2yMoDF9Yju6pfhg aKsWV8rMsU6jph6CzH1QDDPMDuYIpuSKi8W+cu5gpxhVBd78Vw3TMT76+ogQU8GrLrLNBQ eTNsKj/PbppfZ/zdafVwrxMGisW0xVSyRcessJqyeoa1/sM3M5IYWKez/o1KA+nbMni5/H YdRSMjzJrG92HninrgnKee5re3F0OPt8nMGSLdjAyUN+33b1dukO8KC1Mmj4kA== From: Andrew Tropin To: Liliana Marie Prikler , 67260@debbugs.gnu.org Subject: Re: [PATCH v4 1/5] gnu: emacs: Build trampolines. In-Reply-To: <8269b690abfe4011b01a59d35f24a5b6ca938f29.camel@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> <87le9fzz9c.fsf@trop.in> <87wmszfql8.fsf@trop.in> <8269b690abfe4011b01a59d35f24a5b6ca938f29.camel@gmail.com> Date: Thu, 28 Dec 2023 08:56:15 +0300 Message-ID: <87r0j6g9a8.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-12-27 21:03, Liliana Marie Prikler wrote: > Am Mittwoch, dem 27.12.2023 um 21:27 +0300 schrieb Andrew Tropin: >> On 2023-12-27 17:40, Liliana Marie Prikler wrote: >>=20 >> > Am Mittwoch, dem 27.12.2023 um 14:00 +0300 schrieb Andrew Tropin: >> > > On 2023-11-25 12:13, Liliana Marie Prikler wrote: >> > >=20 >> > > > * gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add =E2=80=98buil= d- >> > > > trampolines=E2=80=99. >> > > >=20 >> > > > Change-Id: I33303bcbaf6cbda15867a5546e793c05d1f0e67b >> > > > --- >> > > > =C2=A0gnu/packages/emacs.scm | 5 ++++- >> > > > =C2=A01 file changed, 4 insertions(+), 1 deletion(-) >> > > >=20 >> > > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm >> > > > index b9d9e2b891..55eab48c25 100644 >> > > > --- a/gnu/packages/emacs.scm >> > > > +++ b/gnu/packages/emacs.scm >> > > > @@ -327,7 +327,10 @@ (define-public emacs-no-x >> > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append >> > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-p= ackage-input "libgccjit") >> > > > "/lib/") >> > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append >> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-pack= age-input "libgccjit") >> > > > "/lib/gcc/")))))))))) >> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "-B" #$(this-pack= age-input "libgccjit") >> > > > "/lib/gcc/")))))) >> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 (add-after 'build 'build-trampolines >> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (lambda* (#:key make-flags #:allow-other-keys) >> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 (apply invoke "make" "trampolines" make- >> > > > flags))))))) >> > > > =C2=A0=C2=A0=C2=A0=C2=A0 (inputs >> > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (modify-inputs (package-inputs emac= s-minimal) >> > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (prepend gnutls >> > > >=20 >> > > > base-commit: 60c97924e9519361494aaf0686e28eb831a42315 >> > >=20 >> > > Applied the patch series v4 to emacs-team branch, removed all eln >> > > files >> > > in ~/.cache/emacs and ~/.config/emacs, executed >> > >=20 >> > > --8<---------------cut here---------------start------------->8--- >> > > ./pre-inst-env guix shell emacs-pgtk emacs-magit \ >> > > --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q >> > > # M-S-: (require 'magit) RET >> > > --8<---------------cut here---------------end--------------->8--- >> > You're missing --with-input=3Demacs-minimal=3Demacs.=C2=A0 You are not >> > natively compiling emacs-magit atm. >>=20 >> Right, thank you! > Turns out you also need to do this with emacs-no-x due to emacs-libgit. > > Friendly reminder that we don't have build system/packaging utilities > to easily replace emacs versions yet, so magit might not have been the > wisest choice to showcase here. > > More worryingly, it appears you're recompiling Emacs itself here. This > should not be happening. However, it turns out that your eln-cache is > always first on the native load path and thus already compiled files > won't be found.=C2=B9 Try adding=C2=A0 > --eval=3D'(setq native-comp-jit-compilation nil)' > and see whether you can load natively compiled procedures and have them > show as natively compiled. =2D-8<---------------cut here---------------start------------->8--- native-comp-eln-load-path is a variable defined in =E2=80=98C source code= =E2=80=99. Its value is ("/home/bob/.config/emacs/eln-cache/" "/gnu/store/lxf6aqh5b1zzaclfxcivk8vw1= q4fhrrn-profile/lib/emacs/native-site-lisp" "../native-lisp/") =2D-8<---------------cut here---------------end--------------->8--- =2D-8<---------------cut here---------------start------------->8--- ls ~/.config/emacs/eln-cache/**/=20 /home/bob/.config/emacs/eln-cache/: 29.1-5c9913f6/ /home/bob/.config/emacs/eln-cache/29.1-5c9913f6/: subr--trampoline-6d616b652d70726f63657373_make_process_0.eln =2D-8<---------------cut here---------------end--------------->8--- magit-status is an interactive native-compiled Lisp function in =E2=80=98magit-status.el=E2=80=99. > > Cheers > > =C2=B9 Maybe there's a smarter way to locate them files? Did I go wrong = in > one of my patches? > =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmWNDf8ACgkQIgjSCVjB 3rDBUQ/5AWm+ZhW9xlkZzBUx47n0uPqaq08EmSTDjKtwVCYVwkzxpzOnVrsxY3go vVmpheF0VajfOUn7VvgSB0M4v7oWyIfCSmTgyXmm5ykpfb1Kglq+4Uy+G22wmCdi oD8oT+Yhdix1MsR2qrlOXoSSRNgxoJJNaVg9a6pCi20Y1FnAYtfrTGxBviVrMTKu 5ha5xNqITBOdnn6Xmp1HXSDdB6paAZTp0b5xqTIVl5VzOyHiQhOC5mMKRJmiGjkp mNzhIVmfVzsXAULML/gXP6/52lAHG0TIKvpUW6lZmx8/6hzmoPD4gTRzXbgW2yFr G7/4W7VtoXLiB3f/X3SOK7DYBTPjMTx/rE2X8LtWBTeRYmJlXpidTU3olmntKsUs vAdj7wgj0hmHnww20Tb2cTbk2jv4MpYLmedQUOpwFx+YKH1/ABjH1npnLcrKKV0J Wcj4d3a7ZhSNEzeJjZ3Sml/AVJkT5WO2twoghxObNY/q+VqMjLkwSZMsLCimsdnK VRYV3/QLJcqFWqO/SZhybrPn9m7C2FNAomW9JXl90MhAgxNP5sPuzcweBVeSnpYi h1mocFdwvZPFxUed5vwD9DmA4Fe0h/kMfjSIN4VUHlOGMRdy1msZIxV8wwVnoCx/ sZfFhNwEuSBMojN+egEyqKT+Fq92PTFvWAfxsAd9f/vzTINnxUI= =fjbk -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 18 00:56:15 2024 Received: (at 67260) by debbugs.gnu.org; 18 Jan 2024 05:56:15 +0000 Received: from localhost ([127.0.0.1]:54157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQLNu-0008Np-Qz for submit@debbugs.gnu.org; Thu, 18 Jan 2024 00:56:15 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:38185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQLNq-0008NX-8I for 67260@debbugs.gnu.org; Thu, 18 Jan 2024 00:56:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1705557361; x=1705816561; bh=6Mso7hWUZlzp/jCttS2+ZIQZWvVuBo4oT859ntmvip0=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=jSZ5RLGposcsrSIg7BUXTzANGnoGzOLMeVOXpu4HZSr0LCUa+uWUVXgBzIS97YUOJ FeTcRwJ8QcJt+F+Cz0ObwO6YM9Ot3KES964cILaLJy2XRa39sFfI2e1eLop4rO6Ms3 iHuatWZu8jxcCh7BEF4l1xiQSi5AmYBeL+750FCcdyVX4KlJYF+TELoCYB/Syu7J05 CHqtB9lxRRjQ0DSHzGHi/pRgWPzu0kTPHJrdUc1Cyof9D4HBq3ee8GsTaUE9+QJNH4 pg7Wf9uij3heRxgPSSl0zO81i/ikWNl0ztlqraVSoV0mb0eh+mizEUEA4L7knUxwP/ DJhT9FTynpv7w== Date: Thu, 18 Jan 2024 05:55:53 +0000 To: 67260@debbugs.gnu.org From: Suhail Subject: [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling Message-ID: <878r4ngp7e.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Reporting some observations for the benefit of the community. I managed to install the following sequence of patches on emacs-team commit 60c97924e9 : - v3 1/3 - v3 2/3 - v3 3/3 - v4 4/5 - v4 5/5 I was able to build emacs, emacs-org and a few additional packages using the options "--no-grafts --with-input=emacs-minimal=emacs". When building "emacs-org-contrib" the additional option "--without- [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.17 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Reporting some observations for the benefit of the community. I managed to install the following sequence of patches on emacs-team commit 60c97924e9 : - v3 1/3 - v3 2/3 - v3 3/3 - v4 4/5 - v4 5/5 I was able to build emacs, emacs-org and a few additional packages using the options "--no-grafts --with-input=3Demacs-minimal=3Demacs". When building "emacs-org-contrib" the additional option "--without-tests=3Demacs-clojure-mode" was needed as well. Having done so, upon starting emacs via guix-shell, I noticed a few messages in *Async-native-compile-log* which noted that libraries such as rx.el.gz and cl-macs.el.gz were being compiled. I observed native-compiled versions of these show up in ~/.emacs.d/eln-cache. Now this seems similar to the behaviour I observe in a non-Guix host where Emacs 29.1 is installed via the OS. There too my ~/.emacs.d/eln-cache has a number of entries that I was a little surprised to see such as those corresponding to rx and cl-macs. One difference, however, is in the names and the relative locations of these natively-compiled files. Outside of the guix shell (i.e., using the OS's native Emacs package) the eln files are named like ~/.emacs.d/eln-cache/29.1-115521d4/cl-macs-7ae82f81-e626a10e.eln whereas within the Guix shell using Emacs built from the installed patches you get names like ~/.emacs.d/eln-cache/29.1-c187d49d/emacs-lisp/cl-macs.eln. Note the sub-directory within the 29.1-* directory present within guix-shell container, as well as the lack of hash fingerprint in the *.eln file itself. I do not know if these differences are to be expected, or whether or not they're material in any way. Thoughts? Can this patch series be installed into emacs-team as-is? If not, what are the current blockers, if any? On a somewhat related note, when is the next merge from emacs-team to master expected to be? --=20 Suhail This email is not an offer capable of acceptance, does not evidence an intention to enter into an agreement, has no operative effect until a definitive agreement is signed in writing by both parties, and that no party should act in reliance on the email or any representations of the sender until a definitive agreement is signed in writing by both parties. From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 09:14:46 2024 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:46 +0000 Received: from localhost ([127.0.0.1]:36801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb0-0002sI-2Z for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:46 -0500 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:57471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYav-0002ro-JQ for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:45 -0500 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-557dcb0f870so2626637a12.2 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846472; x=1706451272; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=e+chlrNWE9AR0xlk2sD1TTalP+/KHw6juW3q1UdAJeg=; b=f+ZGv71DxrnNu2as4xOjlo1TjfAA33hyhBCqHrB5Od1d5UfIbxkKY2ISf6BnZc0XDD 55vr54NUmHwUWsn8aNWGEnUE121FPhzyJuRLelACnS9yaeyFRA1SlzA32amrRBTZ50+c Pn2GlPu0uOCOYESnK8fZKzNzSdAf9hbtpqwTFxU2ky3ZJdJXQ8rFswGYWjY8KoUdvhL0 n2bFMudgUpF3cF0Juo1HONfIP2T2c1ST0WwbnNYpnMF2yKutLSczPvM5cgY22XsrnpdG ylYZS/ZC639qw4smNXxD1VizSddVwgJ/TVkitkFTaZk3/d8surbXZHNTydr9cQKNjFd9 zwZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846472; x=1706451272; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e+chlrNWE9AR0xlk2sD1TTalP+/KHw6juW3q1UdAJeg=; b=fbGrTNAWFdjEt42jYhUJ5fVMwCPd5+zoITKKGsQTq199kVNsfvvgvhhbWJ0sQBf39Y 9ahmEpP9+4BPdiErO1yUW5d5FVT7HZZasb52Yyfa790NvcgnN+0ep3YREzqzU6tPATM8 07KxaeqTOaV9niQD7vP/G4BQLI7SnjLaH23lJc40ibYEDghDUgM7xREnmVej26AvDv/K naN8/W2QmOa8uxyYld7VTDKlRTrEb/xYI7KNPLdUJq0yEfpOAL6x7tP8HkRM49qaRUlB v+2lwb2GIc2hRn/Qd+VyI+CD5+PAesgap/xQ3fRGYwPdUpmbjvTcbLh8/3yI0AYYWTI1 +h0w== X-Gm-Message-State: AOJu0YyKuygod/sImg52gqcTiBGUiTiXV5Wg+1w+6hP9P9fFl9UWFW0S LT4OB9/+JWDHcdNZmXQ/lZJDw27EKawPWZl1nQZyVCHGVzuo3sL3Cpa4gLX6OHY= X-Google-Smtp-Source: AGHT+IGketHYXT+9hor53w4q1WddxotX5c+DbDyO7G60C7xhE3rXPkkkIKnoGnLEZNRNgO6C2rS8fg== X-Received: by 2002:a17:906:c0d0:b0:a2e:70b4:28b0 with SMTP id bn16-20020a170906c0d000b00a2e70b428b0mr1331338ejb.3.1705846471855; Sun, 21 Jan 2024 06:14:31 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.31 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:31 -0800 (PST) Message-ID: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:41 +0100 Subject: [PATCH v5 1/6] gnu: emacs: Build trampolines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 09:14:51 2024 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:51 +0000 Received: from localhost ([127.0.0.1]:36803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb4-0002sq-Mf for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:51 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:47233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYav-0002rq-Uv for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:45 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a26ed1e05c7so242733766b.2 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846472; x=1706451272; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=YBak83qGsVcl4xRuH2FK8JrBMV49823uQX60qaFWeE0=; b=lF0ItJ2Kb6ZfifICRDGjPTxD3Um90HBfgUg3msuAzkS1eEsyFCjpzTbkTZE/tE68lv tv6lu6fUuhZRVJ3aTnzQYRRl+QxuPFDsUzseeG9TdstfwxDhKfcT55O/TRYSCDLIICOH xEm9gLVlmb9B5Tsvpk3gDQwk6XVvSRRTrzeVZlt3RuIwEbC1ShTH5cFCEvEDPBdMqvQq oGz9L4EzEbI4xDYzkBlduA1dECC1xIVjZhTadA5h9QMbf1+ACsamhQRcDo+uIlL4Ovc3 RK+h0Rt4KxNME9rT34LCCKWwdmGxoMsqhLE74nS4wdM6BYoQLIWuP6KIv97Ene9b9x8n CtXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846472; x=1706451272; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YBak83qGsVcl4xRuH2FK8JrBMV49823uQX60qaFWeE0=; b=KCsRWwvlFHqpVEeW3/s7lSoecKeD9GzBx+CfQT2juFeaDhwCdKPWM/Gud0k4nsgujW LWsT3wT7dCUvDHVXQVtw2PltgiCIOaQEpDzJLzKsBxRr2F94akB2FHnuwOCfpyD7Y33e Yp7xphyY8FL8qy4d7+I3oiv4PNgMbNBdg1Oe3K8BW5a3TmldphvpFnp8ufl3YfJIBzHk mHtCxAVjz8L28QvSlppmpGi+TPYXZsAZlqOYulGSI41ZkgexO7q1+2Of5L5nLvO6d/sD V6AuoMXW242wpcbnM/ft8F+Z3hJd0eOD7D1XLN7K38z7tC3oJN4dPOKrk/ltIIbx3zM1 bf/Q== X-Gm-Message-State: AOJu0Yyb4H5HCcYU5T1U2GZFxmoOQ1Jf/LIwdUClyNgn1IOTM38eDKi/ jYLgEn+/R3glzuhSDnoiIGH8/hwXYbUQlIlsx+ukEFqClyrEJ1EM1DX9EG8GsDA= X-Google-Smtp-Source: AGHT+IH5pVyfYgS7+oUtrebL7jedlg3RaMa7V1kSo6f4ouJ/LJJY+fFDCaSHDUBoZqtiXc7C+1Lafw== X-Received: by 2002:a17:907:f90:b0:a28:32ff:8709 with SMTP id kb16-20020a1709070f9000b00a2832ff8709mr879749ejc.15.1705846472520; Sun, 21 Jan 2024 06:14:32 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.31 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:32 -0800 (PST) Message-ID: <388d3766e6908331c0704687141f33aeae7ee969.1705846445.git.liliana.prikler@gmail.com> In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v5 2/6] gnu: emacs: Don't hash file names in native compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 197 ++++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d1afd4555..7e6a0c5006 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1121,6 +1121,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 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..714b707e47 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,197 @@ +Upstream hashes both the absolute file name and the content of a file +to derive the name for the natively compiled files. This breaks the +staged install used in guix, as any $GUIX_PROFILE is distinct from +the build directory. It also breaks grafts, as hardcoded store file +names get rewritten; thus changing the file hash. + +Index: emacs-29.1/src/comp.c +=================================================================== +--- emacs-29.1.orig/src/comp.c ++++ emacs-29.1/src/comp.c +@@ -4396,26 +4396,18 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc + Scomp_el_to_eln_rel_filename, 1, 1, 0, + doc: /* Return the relative name of the .eln file for FILENAME. + FILENAME must exist, and if it's a symlink, the target must exist. +-If FILENAME is compressed, it must have the \".gz\" extension, +-and Emacs must have been compiled with zlib; the file will be +-uncompressed on the fly to hash its contents. +-Value includes the original base name, followed by 2 hash values, +-one for the file name and another for its contents, followed by .eln. */) ++FILENAME is resolved relative to `load-path' and only the suffix of ++the first matching path is kept. If FILENAME is not found to be relative ++to any directory `load-path', it is used as-is to construct the return ++value. Further, if the NATIVE_COMP_BOGUS_DIRS environment variable is set, ++the first matching prefix mentioned in it will be stripped as well. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); + +- /* Resolve possible symlinks in FILENAME, so that path_hash below +- always compares equal. (Bug#44701). */ +- filename = Fexpand_file_name (filename, Qnil); +- char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL); +- if (file_normalized) +- { +- filename = DECODE_FILE (make_unibyte_string (file_normalized, +- strlen (file_normalized))); +- xfree (file_normalized); +- } ++ Lisp_Object rel_name = filename; + ++ filename = Fexpand_file_name (filename, Qnil); + if (NILP (Ffile_exists_p (filename))) + xsignal1 (Qfile_missing, filename); + +@@ -4423,64 +4415,53 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); +- +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); +- +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation +- +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ +- +- if (NILP (loadsearch_re_list)) ++ FOR_EACH_TAIL_SAFE (tail) + { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } +- +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) + { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); + break; + } + } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; ++ ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); ++ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } ++ } ++ ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4475,7 @@ If BASE-DIR is non-nil, use it as the di + non-absolute BASE-DIR is interpreted as relative to `invocation-directory'. + If BASE-DIR is omitted or nil, look for the first writable directory + in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory +-whose name is given by `comp-native-version-dir'. +-If FILENAME specifies a preloaded file, the directory for the .eln +-file is the \"preloaded/\" subdirectory of the directory determined +-as described above. FILENAME is considered to be a preloaded file if +-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME +-appears in the value of the environment variable LISP_PRELOADED; +-the latter is supposed to be used by the Emacs build procedure. */) ++whose name is given by `comp-native-version-dir'. */) + (Lisp_Object filename, Lisp_Object base_dir) + { + Lisp_Object source_filename = filename; +@@ -4541,19 +4516,7 @@ the latter is supposed to be used by the + + if (!file_name_absolute_p (SSDATA (base_dir))) + base_dir = Fexpand_file_name (base_dir, Vinvocation_directory); +- +- /* In case the file being compiled is found in 'LISP_PRELOADED' or +- `comp-file-preloaded-p' is non-nil target for output the +- 'preloaded' subfolder. */ +- Lisp_Object lisp_preloaded = +- Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); +- if (comp_file_preloaded_p +- || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), +- CALL1I (split-string, lisp_preloaded)))))) +- base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + + return Fexpand_file_name (filename, base_dir); + } +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/src/Makefile.in +@@ -553,6 +553,7 @@ shortlisp := $(filter-out ${shortlisp_fi + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 09:14:51 2024 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:52 +0000 Received: from localhost ([127.0.0.1]:36805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb5-0002st-Hr for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:51 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:55775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYax-0002rw-GL for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:46 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a2fbb646eb4so124886466b.3 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846474; x=1706451274; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=nBWG7WkQDzK3qdv8O7XcHb/EOXjaZ/ipWG7GpKuEmn7ofPA1lwQX3B3x3YMIouBgY9 Hvms36lu8pWczc4XoFkvO1ff3P0/7hzGftZaTWJqB1H+9Q6Sx3AOMoYYKQdoN8jtgP97 /+AHscMElvWmDytqHC64Q15zRjbaZCkJKOFrxvzVxLofckpNnJvZKif+hkxQRXNuqQoY 9PCYm+FL5CXgdEMHEkRvGP6aiuW5m5XZYNSbMP9bfMabwLYsE/uJHI99hrj/tHJSs1Uj IV5qt44WPqYo6wHDKm3pJgG9LWFXJi8jHLfxWgpMHtq2HVBPgGn/7jGiHxVqvsUNzAzj bVHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846474; x=1706451274; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=V6/u2eMxTjfxobVb/l1h2vFNOGFV6DXC1s5MbsV2vMRPza64FVFCn4Tz05UrGTBkE6 8+WmAwYTM1exPsq3b+H7U9K36B6aaPeYpJCnk6Po3kVrMIUy1dGus/HwLxn+V1167DSq XyarK6z4ihYE1G2lKFJC330AlSxNMnWnEEBvMiM7+vfwSPMVUvwQKaeXhSOFvvCZ4lWP WgXIs1mzMT4NXbhsOu4jzhYq3tVNmhmipm6Ld/oLu+3CVMfTasS/wvdQ3f5GJY0K6UfU ejmnkJg2jxa2I6BD7IRrLedpTXnbQ7VFqE7ZsFM3S2FGqoseQH2tKsmA9avS+NE+r3UF f7Ew== X-Gm-Message-State: AOJu0Ywts39OGOJjiGEEsKlpZmfYq3fSpBFBhTDUZ4UoFlNgFzZJHF1k G8LT1cpzxtqNFBcLE/WdhpQqN6QL2H8KHVALTS/6YYbOu4YjufzPA7LccmsEL+Q= X-Google-Smtp-Source: AGHT+IHZ7wzOpUjcQ/140VMAyzFY7TJ+K5AljbTctLZ8sJwkHQzxmw18UTbhkVDJV9o0cB4UNsOXWw== X-Received: by 2002:a17:906:d0cf:b0:a2b:ca83:1576 with SMTP id bq15-20020a170906d0cf00b00a2bca831576mr1355823ejb.85.1705846474395; Sun, 21 Jan 2024 06:14:34 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.33 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:34 -0800 (PST) Message-ID: In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v5 5/6] gnu: emacs-magit: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 09:14:52 2024 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:52 +0000 Received: from localhost ([127.0.0.1]:36807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb5-0002t0-RX for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:52 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:56584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYay-0002ry-Cf for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:46 -0500 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-55c2cf644f3so336965a12.1 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846475; x=1706451275; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=t2c/i1Zs9XL5zjP5zPnCrdVqoUM9vZIlic3GyG5TdYc=; b=kjJoWDV1CEIeTEDslaGUuzc1c+4H1bjrW7Bzbf1I/xIDkL2q37rmzNOLNQr86pQx2M KtxG32ufYqfwK/rq6NF8MyIXjatdZQ+qWZxMnIo8r/i5J7IZRwGo9LSILsSmL29W8nK7 uuwzk8AMR9mCDvD/HY78vu9RoeoArOK/aizUG6ubtWizsGtdkaUSLM/U5gxCcQ44YbxF FehBuqcdotAkbTOqIpOevDUMIkw1zFpFDRZMT17BQx9rVlC7P0OL9kkua9zqJZ4NgDod Z7Ug4WGWQDulrMx3YKYmaDDYGPmpUK2K1nksAKis+u4+5A8ThhD4h6jr/eD+N8OTl6sZ jBbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846475; x=1706451275; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=t2c/i1Zs9XL5zjP5zPnCrdVqoUM9vZIlic3GyG5TdYc=; b=f3iuGFccNbYKGErg40PKELQxVFCbLU4A7fVDEal61qLPD+3XRBm4b9TEsNSGJj1NHS ka7j4khjygePEROaGs8khnL8/SlfLYWkw9BL0hErRdE2tmMZYqek+L+l1d87FLZ3DGaF +sefv6Sm/EPpgwGno6F2Bebolvtro/U5FA1pzF1PH4x8ey9aXwiJJZV3hUgSXGdn12lT Hr+UCyHlsrjg5OFVWdpGw/aMLohwGujk05xB2LBQhk3ZgJrI7iOVdns0M1QYO8Tn16Uw yJj4Rvy4L6r1IFKCnCsEU3cie0GjJXt075h/zK8gRXR+fEnrlHv35XagmYy9w9ieVln7 1Zbg== X-Gm-Message-State: AOJu0YwGlHejWHmebA8e7rInscZoQPFMtvMc6dSc1v/Rbzwax+abkylC gRCK23kMcRSoyFVcIaUyLQk6iWXVjlb5HMnx096exfhZUTgLMCGMGRK80JIE X-Google-Smtp-Source: AGHT+IGJWDujW7cF6pgr+iBYtuMfkXxQVRWQRhdBDqSvA34VbqSCIUcazmdhjeBtAP25kg+JE67+Aw== X-Received: by 2002:a17:906:b88c:b0:a2c:cdd7:bdee with SMTP id hb12-20020a170906b88c00b00a2ccdd7bdeemr1429907ejb.132.1705846475034; Sun, 21 Jan 2024 06:14:35 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.34 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:34 -0800 (PST) Message-ID: <0e8f58759ef025b3fc010b021a157a80babfea18.1705846445.git.liliana.prikler@gmail.com> In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 15:09:47 +0100 Subject: [PATCH v5 6/6] gnu: emacs: Disable jit compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 182de0204d..c83d6114ef 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..3320fda779 --- /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, with this switch enabled, Emacs will recompile libraries ++that were already natively compiled with Guix, so use it with ++caution. */); ++ native_comp_jit_compilation = false; + + DEFSYM (Qnative_comp_speed, "native-comp-speed"); + DEFSYM (Qnative_comp_debug, "native-comp-debug"); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 09:14:52 2024 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:52 +0000 Received: from localhost ([127.0.0.1]:36809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb6-0002t8-A4 for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:52 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:52718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYax-0002rt-61 for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:47 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a2eb5c4dad6so156819066b.1 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846474; x=1706451274; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=bhgL/dKUFa7JqdorRBde9eo3pCL6NdLIjIs1XjbWP77sdp/7uaZySQrmlAV6UPemk3 FgoJqnvRDA/ksot0M7NAkRzCEqry5LFciVZEhOSGjeBZqlO80T3SGraQ+3vdQKJinZ59 93Zo2QcEUtNhDKyDHK8X8H90GVVFECyXSB4kXLOHZmzoqPAjXMa3pVqytMZzQE/+ZmH4 AzVrrGe1QZT6Ve4T3ll9TO5bZv5/xgN6igdepoe2Kj9VJ4XVUrMN0IxqvkZ52aU8JJVd 9OqkYSXxSGXLfh0hqe6kAfYxhilFm6U27SjnN2Wq3b2rwJbf7jsXMB4yghtijE6OIYbY osIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846474; x=1706451274; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=TVck0PoHVnpJG9GSjjmjRRXd2FGvZGYVHkuHMFcOL2FjpVZnHJNqscxBRPuv13IfV/ 1tyWXij0BqjKM4HrEFVT22Eymc1E6RJiVD95h4auHhMPDsaHSP9deUBlEB/++LQmtyzZ sTivNjlj8q4Yg2FXRB4DxXbbR7yJ9H2TCRbbI5zBz85F4mm07qNnHpZ0Es4mrD1hS+Jj vwcE/7nAdpzFFQwvNf4KjGNHucaFDfwWFAwAuu4/K5SmOidf7oBJYWcCqMcFxQ63TDJy UCbFK+aHL4pDGqzTzJ9vHQY5fHdm0xaYyK3/AuouQFbPleqYEQBxrph0fVJXZeKwYmpx SNaw== X-Gm-Message-State: AOJu0Yx81GzbPxpIgAdJrGncXCi+TKAmkCTXt8Zhhn6DmujJjgnV0ezK dsH7STvtks0n4wvBqgdOpWctLCXoayvI1AVCgRomrCewjRYJkWeijHZUlp4x X-Google-Smtp-Source: AGHT+IGuOGCE6MQHcgGq+jxQNUl4OqGpHLUMyRnLQXCS4Z9JkhZKSXQJmCnvYu5N16k46Gy0YaPzeQ== X-Received: by 2002:a17:906:d0cd:b0:a28:f8a3:5b61 with SMTP id bq13-20020a170906d0cd00b00a28f8a35b61mr1379731ejb.57.1705846473803; Sun, 21 Jan 2024 06:14:33 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.33 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:33 -0800 (PST) Message-ID: In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v5 4/6] gnu: emacs-org: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 09:14:53 2024 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:53 +0000 Received: from localhost ([127.0.0.1]:36811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb6-0002tF-Ky for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:52 -0500 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:54479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYaw-0002rr-Ir for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:48 -0500 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a30359b97a8so24287166b.0 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846473; x=1706451273; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=ba+WiP8PAJ8N2tq5L2/gk2wlxlbf2AMjL+iA4EzmCQGw8ubQGumsiA/7C2wEnJv6Pe 1wh5dqIHLE1huUQya10JGSSqK3dPlhfhBSz9UAbVBWozuHk4E1MaurkgRnQa3N16s0B7 X6lzFGWWfn76XCsbM4i1KXvfydhf7/h9pn4RhsLrneyLteTCfeGhSEJfPycc2M6xqR3v 6E8KSLj2PYH1OKgfalmbAI2+FzAUyZIa5baJi6wm40PbLYeJnZbgjh+iQJ9S/8aD0Qe0 nX69BDk4lvXUjHGTsH/XaPbuW6XqWQJA0Vvf/70z2hFdQ7WHE395QwGUi6wHi4YX5nAG 4GnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846473; x=1706451273; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=WeLl0asXW9ukTBMT38hLNP+Djl37FdNmD1FtQtuNAiJR6u0iB5I7uC7dHU6MJhorOh hLJxUG6Y3NsqLz80wAd4kqO8lBV7Pl45fQfaoz+CUXQLwxusMlzp6nuJcTnSL1Tb0tIw YH5dQBFjhm9k3Hpxq7oyQpEt/Hdjhwl8SrrSMiRorZHYFsrLhqN0V57PheJCoHklmZFr C43it84iYoSKBdmOEBlW9DbDp+ONKZcRzxRUuui4IFehCQ9fbvqByJJlfBsEqh8e6ZyQ OGeGqfB2ikxbc7IkdJsWEOOZRxN72Pz3hbMvxF/k4ouGtZHCj0Uox3QkG/v9LtH5tdXh zE4A== X-Gm-Message-State: AOJu0YwsEEfgdBwzNahUlcWPnGW7jigdcein5FFqucfo9nGwhkzAprW3 D78eW0l3s+bQorWpxivLG6cG3KI30q9BQWpnsPDbWmpsjD46ecEq14mj4WEM X-Google-Smtp-Source: AGHT+IGY9x1tvQl5sHgyigyh85iW5ID1lgNXw53hDSFBO0NTguScsETly9gdvKFezlSvMgFuahWdVw== X-Received: by 2002:a17:906:17c8:b0:a23:5c13:20ce with SMTP id u8-20020a17090617c800b00a235c1320cemr1263256eje.144.1705846473196; Sun, 21 Jan 2024 06:14:33 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.32 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:32 -0800 (PST) Message-ID: <4da49fbeb3bebc49b852e2f8d3af8655d7b55dba.1705846445.git.liliana.prikler@gmail.com> In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v5 3/6] build-system: emacs: Compute relative file names. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 23:17:15 2024 Received: (at 67260) by debbugs.gnu.org; 22 Jan 2024 04:17:15 +0000 Received: from localhost ([127.0.0.1]:39576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRlkI-0003tS-L2 for submit@debbugs.gnu.org; Sun, 21 Jan 2024 23:17:15 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]:51527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRlkE-0003t6-58 for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 23:17:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1705897018; x=1706156218; bh=+wbzz/0iqwoWyJEvG0VeqTglfIn3dAdHNY5d2AUV2B0=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=SeqdSKHmbbGIh5YkMbcB2m6n9/Qh4nF+rbWHbvbFUr8il64ghTADju8Sn3dzoiA4D dS3XuhMbu7BEiLXZSV/fNM529WhlHfAnvLeRRyy8DDv7rJ4HTFPt4OmSd6K0+65Uyi ACbevmPmRGmCuryz1n7rFdnCVxu+z6ObcTTSbipXvYuUzoPes9Ovrdr+tnknl4ZhG3 ZAaRw/FEOZRKXB9GU3jqP2KFhKUZViYixuRbGi68jpg5d0lQDPbnC641zHgR9Kp1Qe mPMsMMEsIjez7yfUL8JtVl+SQXrTomP2s5xEx0U4lvVfG1wxpL/6t044/9hVnWhc2W Jfy0eNoy38ejg== Date: Mon, 22 Jan 2024 04:16:56 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v5 6/6] gnu: emacs: Disable jit compilation. Message-ID: <87sf2qator.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Liliana Marie Prikler writes: > * 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. > --- > [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.40.22 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Liliana Marie Prikler writes: > * 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.pa= tch I don't believe this patch is sufficient. It seems that the variable 'native-comp-eln-load-path may also need to be tweaked. The path to the "native-lisp" directory needs to be specified absolutely to make it not be dependent on the invocation-directory. Details below. #+begin_src bash :results replace emacs --batch --eval "(message \"%s\" (car (split-string (describe-functi= on 'describe-function) \"\n\")))" #+end_src #+RESULTS: : Type q in help window to delete it : describe-function is an autoloaded interactive byte-compiled Lisp #+begin_src bash :results replace type emacs ls ~/.guix-profile/lib/emacs/29.2/native-lisp/29.2-e9db68ab/help-fns.eln ls ~/.guix-profile/lib/emacs/29.2/native-lisp/29.2-e9db68ab/*.eln | wc -l ls ~/.guix-profile/lib/emacs/native-site-lisp/29.2-e9db68ab/*.eln | wc -l emacs --batch --eval "(message \"%s\" native-comp-eln-load-path)" #+end_src #+RESULTS: : emacs is hashed (/home/user/.guix-profile/bin/emacs) : /home/user/.guix-profile/lib/emacs/29.2/native-lisp/29.2-e9db68ab/help-fn= s.eln : 1715 : 236 : (/home/user/.emacs.d/eln-cache/ /home/user/.guix-profile/lib/emacs/native= -site-lisp ../native-lisp/) #+begin_src bash :results replace emacs --batch --eval "(message \"%s\" (progn (add-to-list 'native-comp-el= n-load-path \"/home/user/.guix-profile/lib/emacs/29.2/native-lisp\") (car (= split-string (describe-function 'describe-function) \"\n\"))))" #+end_src #+RESULTS: : Type q in help window to delete it : describe-function is an autoloaded interactive native-compiled Lisp --=20 Suhail This email is not an offer capable of acceptance, does not evidence an intention to enter into an agreement, has no operative effect until a definitive agreement is signed in writing by both parties, and that no party should act in reliance on the email or any representations of the sender until a definitive agreement is signed in writing by both parties. From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 21 23:37:05 2024 Received: (at 67260) by debbugs.gnu.org; 22 Jan 2024 04:37:05 +0000 Received: from localhost ([127.0.0.1]:39625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRm3V-0004Tm-CR for submit@debbugs.gnu.org; Sun, 21 Jan 2024 23:37:05 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:60489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRm3R-0004TB-Ce for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 23:37:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1705898210; x=1706157410; bh=4PJVlI0/6UOL1K+fAj7L/BCNhGLlX3tVJ8HD7qKhqEQ=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=dsvIU3s/TYYjNCBAov7Jto9OoP+80Qykpx8v8spOhfmkGTx/BG4DChusisU9LZflf bdHaK+g7ZvZhWOB2eLSJ1nMjpgl9O51YVe3vNIK2KW9AhR11n+PKF64T32WSTxy9GA pkr8Y7xClwklswgIH2SejrAGdBPYbSx8gSL0H7XltI4H64n/nOn6UM77ZJDkUeAbGp vfV4NGX0fB0TuFpRfSn6FH9HMkOSvsfMHZPYCk3zq5v9odUcwWv3u/mi8u2Jg3G+cH Tyao5+1zhqax3wz+1cfmRCQ+rd5kKPsx26jHp04mmGrH5Uo+r8Ada2Q+B8cHXD+UzP i89+WrgHX9gpw== Date: Mon, 22 Jan 2024 04:36:37 +0000 To: 67260@debbugs.gnu.org From: Suhail Subject: Re: [bug#67260] [PATCH v5 6/6] gnu: emacs: Disable jit compilation. Message-ID: <87o7deasrx.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Suhail via Guix-patches via writes: > I don't believe this patch is sufficient. It seems that the variable > 'native-comp-eln-load-path may also need to be tweaked. The path to the > "native-lisp" directory needs to be specified absolut [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Liliana Marie Prikler , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Suhail via Guix-patches via writes: > I don't believe this patch is sufficient. It seems that the variable > 'native-comp-eln-load-path may also need to be tweaked. The path to the > "native-lisp" directory needs to be specified absolutely to make it not > be dependent on the invocation-directory. Or it's possible that a patch that ensures that 'native-comp-eln-load-path contains the absolute value of the "native-lisp" directory obviates this one (6/6) in its entirety. --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 04:30:21 2024 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:21 +0000 Received: from localhost ([127.0.0.1]:47314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3w-0007Zy-Oj for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:21 -0500 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:58372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3u-0007ZN-EB for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:19 -0500 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-a315f43ecc3so71050266b.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175007; x=1706779807; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=op5+qAXkZvZoZO/tiwt0Qwd8FTa7QiK4YVFY9U0fXHg=; b=XAIFmQpn3YH76LVPjDq/zbWlXDLPt4PPeSpYYj2WQKSENr0tQyUYECUs+YETBA1+5p AmRpeEqT4VaM0bKn1mXSbj8Bg4NrJTr4mbZuKJuNqmmnU2Hf63vn6XlbNZhp9yZIvq8a gJkaRywdjw5leuSyshkDabDCaDIcQjzh9Z8/sgnnqj8ecJAbMQ3BPKrJPwcJKygtmcQ4 OzzUvOCjj0vpZKrYNkNsVn+Gvb3iOOsDCJrAFFyk7WGlkWOcymfomCjtYkW9ej+25+Ph k6sbW+YX7b3tJXT3SUAKTZFffLZFgm55AO5poaJ7f4X91wtw027DiWNUcfGHb9IJU5Vd 9G2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175007; x=1706779807; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=op5+qAXkZvZoZO/tiwt0Qwd8FTa7QiK4YVFY9U0fXHg=; b=dF2T6xbfQupU0CVg9/mRIqlGRNq2nlcoQiSOTZlwPq8dWhhw8ke+3tLeSfYN9RidhN ehdt/Q9e//yhPNNXA90io0ek7OrB6wU8lTcgE78NPesh8Z6hc+RcBEVy16deG/rItYXr 2D46BLuWMmUOpjiAQkVcFkPemC40juZF2hawhzTGR7m3H8CISiJaDiS7007B7D/iThYj wQmWzSbBDJlc2DWdHjx9D29bc++EMXYJ+vW6b4RXggkK+nTlvQqoRAtBN8I3pXkayd2S B6zcPuzUu1ZKhtjiS6w9xcI0/UwutNAabBoIkgMe69X6ux3g4AYcwjA1vpUQ5hWvQrPC MTzA== X-Gm-Message-State: AOJu0Yx2OS0ctCd707OS3nI02A6R42CK3DjOy3QPjpVdmg9hYSrb6nSP f9OilqY99a8vZUZei//jXbYgpCx+iZ/KovpzWDZLaIiCPKq8gOfdpWlOyMDMfI0= X-Google-Smtp-Source: AGHT+IHn3i7uLwXB3626T3slO2n1AIN45qXiLI3F8wvSS1XxZZw+8gH5mkeY2wFDP8DOq7vSPM/Eog== X-Received: by 2002:a17:907:d30a:b0:a31:7c6c:a997 with SMTP id vg10-20020a170907d30a00b00a317c6ca997mr241111ejc.98.1706175006604; Thu, 25 Jan 2024 01:30:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.06 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:06 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Mon, 22 Jan 2024 21:21:26 +0100 Subject: [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/emacs.scm (emacs-minimal)[wrap-emacs-paths]: Also wrap EMACSNATIVELOADPATH. --- Am Montag, dem 22.01.2024 um 04:36 +0000 schrieb Suhail: > Suhail via Guix-patches via writes: > > > I don't believe this patch is sufficient.  It seems that the > > variable 'native-comp-eln-load-path may also need to be tweaked. > > The path to the "native-lisp" directory needs to be specified > > absolutely to make it not be dependent on the invocation-directory. > > Or it's possible that a patch that ensures that > 'native-comp-eln-load-path contains the absolute value of the > "native-lisp" directory obviates this one (6/6) in its entirety. This was the most cryptic hint towards the actual issue, but I've managed to resolve it anyhow. We still shouldn't enable jit compilation however; I've updated our reason as to why. gnu/packages/emacs.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 04:30:22 2024 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:22 +0000 Received: from localhost ([127.0.0.1]:47317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3x-0007a9-EO for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:22 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:58439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3v-0007ZR-21 for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:19 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55a90a0a1a1so5682022a12.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175007; x=1706779807; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=hPwsw6IgfEN5gUcpMNxh1WE8jwocUxKr68x6nIbOMOezLuAPdftCTankoaLSV65pXT gV2hffWtQWvWV20JX9oopFo5mpnLx2dpODqtxRZ8HDpEFYmvMx7cuBGOicRkqymMbCA5 KtffGWbL3+tUYtqZFyoltOcSJarSkfKkkZLhY6v5b4xHEVOzS3nwbLieF7bYnaedP1Ss NJV/OCTBY8a3BEaL5DcGulkJdT3pbcmOBvGk7jZcWSh/unJQBrWFhE0+7i1KeC6w1c5V cfxKODsPTkfyhw7bt/gUe9KK8Wp3SqZTPclr6SdG9yj2336I1mt8kBOj8SPya/DfY0rs 5VrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175007; x=1706779807; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=GQGDT0cQODQATAe1+q+A+6Gn9DMfuCnPRNkBkuKPC2iWQZaX+rFPwyhO7VlgvInKEO dJkD+nt18ns/JO0duCtNquCAV0wo/Z1GqzzMQj1KzXzDz/5GqvQgjkznHwRNVuoeQGBH f8mtqbLCBokEYbhi+OtUfEeT6iL/33pF66RNlGnVlnxyaufxJRH3wXm9DPcukCiC0Kpn 9WXk87ZA81qCtejXDbhn14kWfKcXuaGyIvBk4jZ20JuAmVbGxpAXJVB+f35Nd03t2ibC V9arV/6j4IzSyFwHFmXgnAGrZamI7kkCKJ0zgEQGxbT3xk+C8f9uQc/BbHpohGIbArZj gEwA== X-Gm-Message-State: AOJu0YyJvl/r0xGoQTKlxRdW4ewwuBzBqaoO9Z8f1NqobqBnS0J/Adw1 mKjFHv+7C0Mfh0sz830BOjwg4xODwyAMzB36g+ACc96KJ1LJ8odE9Q568CxCrAw= X-Google-Smtp-Source: AGHT+IF+5jnF7xTR2t/hiTwJzvWwqNGuhKDv/kFQHHJ6LnwXy5JhfeOOjUaZijrIADln1jWsEwDEtA== X-Received: by 2002:a17:906:2ad5:b0:a31:82d3:75be with SMTP id m21-20020a1709062ad500b00a3182d375bemr126688eje.66.1706175007186; Thu, 25 Jan 2024 01:30:07 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.06 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:06 -0800 (PST) Message-ID: <75fc54d6051c02ab2edc333de71ee4689a287ed0.1705957032.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:41 +0100 Subject: [PATCH v6 2/7] gnu: emacs: Build trampolines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 04:30:29 2024 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:29 +0000 Received: from localhost ([127.0.0.1]:47320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw45-0007af-2f for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:29 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:51266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3v-0007ZU-Sp for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:20 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a271a28aeb4so697742266b.2 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175008; x=1706779808; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=jRrFZD+oBGw4udYnzZZPBa9oyN1WDFPd/834RCsbwJoNonxXawW/dPE1eTh8bQQDrS BLuftU2ovJVhZHFigBJk7vmf3Rm74EV6UhxvTtkbpgeedgdkAfynRx4aGzEdzHzdABLv EV7ISe7aVPW3Q047J+g4DJJzmh0J0MJ6U+Vkeq0iyUblSLZVBhjKfnNMLKfVP2Ir0/WF A+Lhq+H1Fz/wPASbc7WdCqgFWcxku/FCPMU3bCBpC+O55xncbJ/9/VGZXkxUiMdijU8w wSgZWcqljNf7YKge35mJEsiDHZaF4hUpBbuhm9fr422HLMvivKDIVTkruHU0BwKmfALz +2Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175008; x=1706779808; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=KQVTLKu+daziWiMEVsnoLLdasVCvr9TIGtu/TPpk/Qe5HggEDXdcgjIrswIaVbP8Vl TaWNLnnqmVzFz1LMxHw6BAck86R72XMtiYthsM92NuamQeE79RM5kYXw6P5aGct6NWuz 8TkonWq8s8gkzQZPO4d0w2zIr4E2T+Z12DUktP47vGIfUqi45bnGGvXD8sKi0RmTEtBY cA/Wwuzkk8xCg5G3aHfuQi9mFtGNs06H6rjkApBzuIBBak6DAZ2Xz7jJAAOsgEmfe2rz ITV8T3tXALFeHopqW96RYUTF3KSns8IYR5UkpPnxYk/imPR/4eDiKByYa6fMV7z3Y5Gd F6CA== X-Gm-Message-State: AOJu0YxUMV6jEzGDGi4eGa6yXnz8hWXbWRlwmLT7g+L14IPTWti9YvsM iRL6JOQcOZWBxzA1FyYZ+natktNdYJk1nS6S6ZhNEaICybovGIqQEEkCz1QBpr8= X-Google-Smtp-Source: AGHT+IE1P3M0juWJc3J3VGBfMu5gRjQNrASbQfFkj8/3tqjJHw9JCyaBD8vfDuyHf3zuAzU2TKUKeg== X-Received: by 2002:a17:906:707:b0:a31:7bb2:96c4 with SMTP id y7-20020a170906070700b00a317bb296c4mr327978ejb.150.1706175008303; Thu, 25 Jan 2024 01:30:08 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.07 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:08 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v6 4/7] build-system: emacs: Compute relative file names. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 04:30:30 2024 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:30 +0000 Received: from localhost ([127.0.0.1]:47322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw45-0007al-Cq for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:30 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:42011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3v-0007ZS-HW for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:20 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a313b51cf1fso95440866b.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175008; x=1706779808; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=JvOmNPdravM11kPQ2ReMhGHECZagEoaWBIOUqN61/Y4=; b=imEFJKPoojJBdRdJT1wogMkUydOSdmUMW23cKDx3m6JTGFTRY6KRHZ0KvVQ1bwt3Ea XsOwdB/g5YzTfChYppTIYPmZh4X76zT5U2VTn7s7YyBwbxxdmffZbebTf5UFV/3AegZz 2/v29G01n/ffdp6cXHJjwdlrNNud244fAXVkEKWLG9k6v2tATEd4idKmjs0O2xzMINLx nx9X4/zUbrZNl54+VZnApIdoDgYi5lnhIRYycqd2LfWE+kW44d5WWuR1/sEUoMnZkgtV 2hI+5f/XKp1nYEyNdG9bWhUkPLbtTRwxXWGEeozN+sroyOk+h9y62buAnkjzYGTz5ehZ e80Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175008; x=1706779808; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JvOmNPdravM11kPQ2ReMhGHECZagEoaWBIOUqN61/Y4=; b=E9oZZoexWa49V3n+CSUM8x+XglpT7ZrfdMvm+vlqu0pXqrfZRTpHyxbOzbCvj7wsiG 6flGiVaICsI2RZypYD0AD2eX8qxt2t0QytLPHumgUdCTiX+Uj4Ia4Xoj8VlIPwchspou 3jKkd4e42mzkVF/7Vl8ttEqAVKETs0Wgo68OCKS68O2gk9Kt36gzcW8POItD4B4wXRZH moHrNSp+wj76LovfrqLX8LrpJlctCVMrlNvIYUJG76ITEz/7RyiRR79ZscEMQMizYZW6 n+vSzglUqYiEyXfc3koxjRGJW+wCks9RwdvTHSK+mnOrOIW/3IxfGBddxwWfirgvD+uC KIGg== X-Gm-Message-State: AOJu0YycHx1hLeegMfOqlMbDihrSxsREhsqIyU41aljTzarQzGblqFJh 4cUgOrdvQTV9OGNb2CbRzF9S/ECpSUr68OLoT/MEM3gMz5O5IGQdih5o20dbF8k= X-Google-Smtp-Source: AGHT+IFXAkb22k7LG8P8Dvjw04d8xtgScCdTAWCptpIHkrD7IlQAHRb0WllB4fzgTUQURXAi9x7xUg== X-Received: by 2002:a17:906:1594:b0:a30:428c:b1b8 with SMTP id k20-20020a170906159400b00a30428cb1b8mr722193ejd.42.1706175007750; Thu, 25 Jan 2024 01:30:07 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.07 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:07 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v6 3/7] gnu: emacs: Don't hash file names in native compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 197 ++++++++++++++++++ 3 files changed, 199 insertions(+) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d1afd4555..7e6a0c5006 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1121,6 +1121,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0292b1bd16..1caa2cbee0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -111,6 +111,7 @@ (define-public emacs-minimal (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" + "emacs-native-comp-fix-filenames.patch" "emacs-pgtk-super-key-fix.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch new file mode 100644 index 0000000000..714b707e47 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,197 @@ +Upstream hashes both the absolute file name and the content of a file +to derive the name for the natively compiled files. This breaks the +staged install used in guix, as any $GUIX_PROFILE is distinct from +the build directory. It also breaks grafts, as hardcoded store file +names get rewritten; thus changing the file hash. + +Index: emacs-29.1/src/comp.c +=================================================================== +--- emacs-29.1.orig/src/comp.c ++++ emacs-29.1/src/comp.c +@@ -4396,26 +4396,18 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc + Scomp_el_to_eln_rel_filename, 1, 1, 0, + doc: /* Return the relative name of the .eln file for FILENAME. + FILENAME must exist, and if it's a symlink, the target must exist. +-If FILENAME is compressed, it must have the \".gz\" extension, +-and Emacs must have been compiled with zlib; the file will be +-uncompressed on the fly to hash its contents. +-Value includes the original base name, followed by 2 hash values, +-one for the file name and another for its contents, followed by .eln. */) ++FILENAME is resolved relative to `load-path' and only the suffix of ++the first matching path is kept. If FILENAME is not found to be relative ++to any directory `load-path', it is used as-is to construct the return ++value. Further, if the NATIVE_COMP_BOGUS_DIRS environment variable is set, ++the first matching prefix mentioned in it will be stripped as well. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); + +- /* Resolve possible symlinks in FILENAME, so that path_hash below +- always compares equal. (Bug#44701). */ +- filename = Fexpand_file_name (filename, Qnil); +- char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL); +- if (file_normalized) +- { +- filename = DECODE_FILE (make_unibyte_string (file_normalized, +- strlen (file_normalized))); +- xfree (file_normalized); +- } ++ Lisp_Object rel_name = filename; + ++ filename = Fexpand_file_name (filename, Qnil); + if (NILP (Ffile_exists_p (filename))) + xsignal1 (Qfile_missing, filename); + +@@ -4423,64 +4415,53 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); +- +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); +- +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation +- +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ +- +- if (NILP (loadsearch_re_list)) ++ FOR_EACH_TAIL_SAFE (tail) + { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } +- +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) + { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); + break; + } + } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; ++ ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); ++ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } ++ } ++ ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4475,7 @@ If BASE-DIR is non-nil, use it as the di + non-absolute BASE-DIR is interpreted as relative to `invocation-directory'. + If BASE-DIR is omitted or nil, look for the first writable directory + in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory +-whose name is given by `comp-native-version-dir'. +-If FILENAME specifies a preloaded file, the directory for the .eln +-file is the \"preloaded/\" subdirectory of the directory determined +-as described above. FILENAME is considered to be a preloaded file if +-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME +-appears in the value of the environment variable LISP_PRELOADED; +-the latter is supposed to be used by the Emacs build procedure. */) ++whose name is given by `comp-native-version-dir'. */) + (Lisp_Object filename, Lisp_Object base_dir) + { + Lisp_Object source_filename = filename; +@@ -4541,19 +4516,7 @@ the latter is supposed to be used by the + + if (!file_name_absolute_p (SSDATA (base_dir))) + base_dir = Fexpand_file_name (base_dir, Vinvocation_directory); +- +- /* In case the file being compiled is found in 'LISP_PRELOADED' or +- `comp-file-preloaded-p' is non-nil target for output the +- 'preloaded' subfolder. */ +- Lisp_Object lisp_preloaded = +- Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); +- if (comp_file_preloaded_p +- || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), +- CALL1I (split-string, lisp_preloaded)))))) +- base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + + return Fexpand_file_name (filename, base_dir); + } +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/src/Makefile.in +@@ -553,6 +553,7 @@ shortlisp := $(filter-out ${shortlisp_fi + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 04:30:30 2024 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:30 +0000 Received: from localhost ([127.0.0.1]:47324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw46-0007ar-7g for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:30 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:55664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3w-0007ZV-DL for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:20 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a31914e7493so26565966b.3 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175009; x=1706779809; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=XLj3n+n7QRS4cvuVOPEq6VDQwoWluGnFeeukD2CXUb6qGXiHeFru35An5zxvWkWD3u XYWvY/7cik0R6T6pLjw8+lK/ofutE6LGqkdtMG8V6u46oZFVDNd9Jf3mRv7oWpf9uiJU SgN+C9JshDS9NQMNilGJgKF2VUqM1ZR4eE/UCfLc9Fd6ABpt27dy3cYdVGqGbvGoozH+ qiaKDKDWpivRNe6rGmIpppszPsxbFIc0ZPcKuid4Y903YSvJsHXGFIHwYdPP18+0yzpv sBvrf4YgtqmiUq6oFPGndmUYJsfTCIHKIgGOmUGjLWPSifsI7J848MRgorO4b9VrnU+k yUyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175009; x=1706779809; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=CHthuzIjPtIsKhffqZSLD9zj7oKINldslxC9rRliXzgfv1P9qknb0vAESkKdq5q7E6 IqlEes+dqbwjlAU1mtazEv4c6BZpP4BZCsJRnZXTdsNIT9I+lOTKeHjwG04fZ4oZoq0d /Enx6GtHh6n5aw6rKNMIHeeLkqA1p/6AO0QNSywi+ksCrzDeQktUR9uF19wZfBKr4rf0 sL6dkJoo8iI2VGIqGhfIeaoLL1LRk27l6QIamtkkKiYpdSzE6UOZ5hZIyJ6jvS5iiNPU Fsl3ISL8P3kI3DgBI7zT7J2yvkIUaBGP+QfnZmLfDIWnA8CBOHrpKUpQzM/UYaFT6xAy RFpg== X-Gm-Message-State: AOJu0YzYdYsd25aLnhuvXRd1Xt6qwr2pLrNemiHN5+2AIQz9RgI/8rvI jwxWOkw3Xz+e+qJBn6vhjThy7NCdUsO8ZNaNMCZFRMk9c/cuw7at0tW3CYZOYHU= X-Google-Smtp-Source: AGHT+IH+FxGOyWlVXpz3T0Up1K2/6J4cYiUxGd+dLbUIdDb56WUYCT9jP8SPTZTqSTgYO7L8oq2hGQ== X-Received: by 2002:a17:907:a08e:b0:a31:1ded:f129 with SMTP id hu14-20020a170907a08e00b00a311dedf129mr397478ejc.14.1706175008953; Thu, 25 Jan 2024 01:30:08 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.08 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:08 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v6 5/7] gnu: emacs-org: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 04:30:30 2024 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:31 +0000 Received: from localhost ([127.0.0.1]:47326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw46-0007ay-Il for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:30 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:54282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3w-0007ZX-U1 for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:21 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a30359b97a8so466450266b.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175009; x=1706779809; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=EUnPexo4k563WmQZwyvR8HYUVItYOCko+W6NZPX3SpJFArOrueOvUmMxZp9Rz5taMm I25mzQuANhHs/dluRQRh3h9dW1lunF9PwO35vwlJCAtTPtOMrpQuI+K+U1MpBSZ9ineJ kWtY0J/bH2NdjtK2aTaH6I0QVyT8zBb4oQKxJWfHJ1YkMr5LdrnhhPm8OxBpRrDgCv5c Y/pLot0PjSta4C3zctlkdeSGb1RAsdXJnhJDDCSSBj8VNBwW8bjhWrC0fz8SgQ2PCsgl HF3MucyiS7rMVFeiXYVUemFwl1z2hITpX8NfMW1Uv3M/qq9cBYwfQCIAffSzx5HYUZOB bTYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175009; x=1706779809; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=pswm/f8q9pFOU/q3VIFUETt45bDYNaxnN0sRgIIsHafjZTZJoMl4dFSEiafT/GAhp+ vU1u5+TaqAhkWQvBBbzEukEJ8npK5RcAu+UjZCLSnlxqv4bK9ngNrKgzZgHKJlGqrl4c +ERVSBgsQS13ZXIlCT/H26jMDP1y0FVYnR9RMT7uoJFgSjvVGo4KeIIOiNqHQx9F4xIj Wy67ME29kgcL2ag3OFHoWefH13Kcp1CYen01t0dg52z/lg1zRsIX/ul8KZwKkuI3LUCU uAKo1MkhCzzOtoNYTgyjv6aDTlOe+6xmqgbCB/2vaccg39PpfEB6rtBRYpjWhaoGmScu /wHg== X-Gm-Message-State: AOJu0YwyFlsktoav3seFWQFuwXFm8RKeO/tkWlS13J9JdVu2IESVc+Ye 0yHolScT+lrGUSKdAW3vUV5r5ZprJydOVrtDr5u99Bq8chyp131TAODrUieoa2U= X-Google-Smtp-Source: AGHT+IHhn0jSohm9hCgfPQcjuPw/2tdQJ9OLkvFfcW8wCtcVJjx668YVM0QFJjAnzJBL3iBzNTMymA== X-Received: by 2002:a17:907:2955:b0:a28:7dd0:adb4 with SMTP id et21-20020a170907295500b00a287dd0adb4mr261761ejc.83.1706175009489; Thu, 25 Jan 2024 01:30:09 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.09 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:09 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v6 6/7] gnu: emacs-magit: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 04:30:31 2024 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:31 +0000 Received: from localhost ([127.0.0.1]:47328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw46-0007b5-So for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:31 -0500 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:48134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3x-0007ZY-PL for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:22 -0500 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-55a349cf29cso7566453a12.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175010; x=1706779810; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=OA29NptUxBNkZIVra/eXzJBTvLr0/QQLAzN6tpsCQmtI9giG9mEct3xIdKwCrz8AFt VxB+BPSTpS8BR/LNAE8RS58Yr838Me8nmz03l5OxWfLJ8Gwfrq19CYwJJpSqmS6Ey1OJ v3LtMVWGos4GxNJJI36iDamMSuF6QD6t8P+ioP4lFPhyA3ZkwTw4lFGnESLE3o5WfTTv V8FolswhLqQtnuzpD3KNb8fYl4kX1jhI39+igvRJa5AmXuupbXAd2PUbYW5Qh1Itx9Zl wubK1zH+mRyWMxVP+QBSrAmriiT2YaualeCS03qXfoOwmhxg/7dV/gS9TaRzRPg4PeHp bCiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175010; x=1706779810; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=DDFxtdcLPkY0IFc3zdU3/GbsEBJAZQfzCSJ9dx0EWd9m11Q2Kqyj1kxC3kDj4RUHfg xR/UF+oQS/37p6OJF8/e1oJVERGNWxx6Fmmh8eF+HNYJBOX5d+bw9gDtPh+dmK9YUDlC GF/RjSv7QN1fD/xvUwfaZuVtywNKNiPrdw1NZJcpwwKGKja14/bgBXv0joj/tixbz1fm YPUGVDkbvFu0m/t3mY3JTvy9+MwHSF0tixAV4oGuPgU+42SzM8PQ185SJPjW9f4M76BO 7yD5PL9U2P6S/qq8SpFiG0pwb0w/I6ypyyZx6anVG2eeTKioNrbXRGFi2POkoVTnrdGx tIDQ== X-Gm-Message-State: AOJu0YxiERebk8Xkr4ql1VESRf2vW+aMkxRb1+Iux/vC50jbWG2x8LB+ to4jK9cHX+7aXtXN8PiwJiZqWXv+jbOHzvUARMxYJm6gkCDBS5BfgcGeM+vrLjY= X-Google-Smtp-Source: AGHT+IHR2JAcrhG8ExqyJsFCQa4Aypfl5nCwKpTCWXkGRjrpdvBOotJZQf6Ls117JWrB5pCF+YIQjw== X-Received: by 2002:a17:906:dd0:b0:a31:3a85:c5dc with SMTP id p16-20020a1709060dd000b00a313a85c5dcmr397187eji.51.1706175010036; Thu, 25 Jan 2024 01:30:10 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.09 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:09 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 15:09:47 +0100 Subject: [PATCH v6 7/7] gnu: emacs: Disable jit compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 25 18:53:57 2024 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 23:53:57 +0000 Received: from localhost ([127.0.0.1]:49608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT9Xh-0000Ms-7i for submit@debbugs.gnu.org; Thu, 25 Jan 2024 18:53:57 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:36491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT9Xd-0000Me-Bi for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 18:53:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706226819; x=1706486019; bh=M9tJKWbvZAof8DSAa5Ury9cMX/fJ50ugD5+WhNIb0zI=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Bv0X3GTo/XV2fu27l2O09/Hzytt9W3xIZ/62czxA7nVX//DtSMhsVWdKU9YLaICM2 8ePAEhYtTi/m3mtXgV4hfUwyTq1Mfih5TukDBoVevZl50NSYZUyJYgaFlgDYJrXoIZ kAo2iLYyQGMfV4vCNWOXAxaZjLzyGewtKzDvboySLlsN/SuZSog2uxrIdS17KqMFzm xaAK9NsqmqAkuZrOwVudL55o041aHnqvbfp4WB9J73yP2r+0fGR09m0+GbvW67GGhJ MYS8EZLr4J3agx9mwTxGGnRIjZT3tU6ujhhxaUDcmcLV6GXhTFIslp8awImCSIZzw3 O83BrUaMxdSvQ== Date: Thu, 25 Jan 2024 23:53:18 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87r0i5otqu.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Liliana Marie Prikler writes: >> Suhail via Guix-patches via writes: >> >> > I don't believe this patch is sufficient.  It seems that the >> > variable 'native-comp-eln-load-path may also need to be tweaked [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Liliana Marie Prikler writes: >> Suhail via Guix-patches via writes: >>=20 >> > I don't believe this patch is sufficient.=C2=A0 It seems that the >> > variable 'native-comp-eln-load-path may also need to be tweaked. >> > The path to the "native-lisp" directory needs to be specified >> > absolutely to make it not be dependent on the invocation-directory. >>=20 > ... I've managed to resolve it I can confirm that Emacs built by installing v6 patches on emacs-team branch and built with --no-grafts is now able to locate natively-compiled versions of features like help-fns etc. (which it couldn't with v5 patches). #+begin_src bash :results replace emacs --batch --eval "(message \"%s\" (car (split-string (describe-functi= on 'describe-function) \"\n\")))" #+end_src #+RESULTS: : Type q in help window to delete it : describe-function is an autoloaded interactive native-compiled Lisp However, there may be a spurious entry in native-comp-eln-load-path that should probably be removed. #+begin_src bash :results replace emacs --batch --eval "(message \"%s\" native-comp-eln-load-path)" #+end_src #+RESULTS: : (/home/user/.emacs.d/eln-cache/ /home/user/.guix-profile/lib/emacs/native= -site-lisp /gnu/store/4jvap9wxifizm56p6pmxc6rk0zyvm5zc-emacs-29.2/lib/emacs= /29.2/native-lisp ../native-lisp/) The "../native-lisp/" entry above, seems out of place. Based on the documentation of native-comp-eln-load-path: > If the name of a directory in this list is not absolute, it is assumed > to be relative to invocation-directory. Contrasting the above with an Emacs 29.1 installation on a non-Guix system, I notice that the latter doesn't have any non-absolute paths in native-comp-eln-load-path. Thoughts? --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 26 00:29:36 2024 Received: (at 67260) by debbugs.gnu.org; 26 Jan 2024 05:29:36 +0000 Received: from localhost ([127.0.0.1]:49904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTEmV-0001Cv-SI for submit@debbugs.gnu.org; Fri, 26 Jan 2024 00:29:36 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:51565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTEmU-0001Ci-B1 for 67260@debbugs.gnu.org; Fri, 26 Jan 2024 00:29:34 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55790581457so9793716a12.3 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 21:29:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706246962; x=1706851762; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=+rLR4vZ2UebGLES2Ko6sR7IRMbtcAqLWMH07dqRCTTI=; b=X77wGkKQ3nCmqK9yb0Xo7yuWDxglDX2PhWMKcJPzWoj7UpAngo7Mc/oiVr8e+l0UXZ 3uR+zEEpz8s500E2zJiHuf0j8A/Dglme1+4oaIUFSrmmuJDx8XhLjikKXyMoDvtpg9ng zcKMdEkug1NqNiHcDRm7d6WcR27fAm6DrKAMAEEAz+1UsVpFYb1KE997/ASsXNB5yGAL ZZv5UJdSmJ3y7Dv6f0bAOkUlfhqau3zlmBBIN/mPIDKw7unfmlkX8lN0lQ+eFbIzE3AI U/PTxqt11HEz1IT7jwjKadPXGcdXPC/9w+uEDxVpaie/uuh/BLajDlz2DyYAb5C30ATN 3uDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706246962; x=1706851762; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+rLR4vZ2UebGLES2Ko6sR7IRMbtcAqLWMH07dqRCTTI=; b=GDvG605Cm2ELZwDMlnPr7azMj+DuNzOHTukeq7HL9qJjGna/+Za/JdJ+1xOA0oPZ9m D+jyAQbadxhbW8zGj/uEj/JDGcw72aOKvy0JhQ59TUEO7JdPzU8HWvANmecQ3M/JzKIb BTmCa2W41YVAOcGWn+8oCNM6o5jG7hPha3zyDXEzuGMuKqtYSS6S2zVQdCZIFVRpCW1W tTmi60NF4Ski7yUOJltN+6EwtGhpRyI7IK3eQ4zhEsehc6W12FlBfQWcTz3KNJM+8/oW niGaftvv48bSIBUGHabXBhX4M0uE6FHLOfVkigLBnI6bxGMxeWxBS9GUMJpgOjF2ZpDA s+oA== X-Gm-Message-State: AOJu0YxVpo5OeBZPgQ5i6n7pj0auDiepz/H2siDZWVxttXJIkvd3WIOu 1HtxZIjKwreNGgEjp4Lng5inLs+8BYcsD703SY4X5veunG/IXLJOjHKCj7uJUBI= X-Google-Smtp-Source: AGHT+IHVgynywUufu7HZTjT3Q6OhJv51Gc7+CF1UNVIaLnQnijNKGcD/fjpVH7pKFjsck89yHWf+ag== X-Received: by 2002:a17:906:c1d4:b0:a2c:4690:15db with SMTP id bw20-20020a170906c1d400b00a2c469015dbmr342117ejb.62.1706246962021; Thu, 25 Jan 2024 21:29:22 -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 kq26-20020a170906abda00b00a3182cc2417sm229463ejb.43.2024.01.25.21.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 21:29:21 -0800 (PST) Message-ID: Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. From: Liliana Marie Prikler To: Suhail Date: Fri, 26 Jan 2024 06:29:20 +0100 In-Reply-To: <65b2f485.050a0220.f377c.aa8fSMTPIN_ADDED_BROKEN@mx.google.com> References: <65b2f485.050a0220.f377c.aa8fSMTPIN_ADDED_BROKEN@mx.google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Donnerstag, dem 25.01.2024 um 23:53 +0000 schrieb Suhail: > Liliana Marie Prikler writes: >=20 > > > Suhail via Guix-patches via writes: > > >=20 > > > > I don't believe this patch is sufficient.=C2=A0 It seems that the > > > > variable 'native-comp-eln-load-path may also need to be > > > > tweaked. > > > > The path to the "native-lisp" directory needs to be specified > > > > absolutely to make it not be dependent on the invocation- > > > > directory. > > >=20 > > ... I've managed to resolve it >=20 > I can confirm that Emacs built by installing v6 patches on emacs-team > branch and built with --no-grafts is now able to locate > natively-compiled versions of features like help-fns etc. (which it > couldn't with v5 patches). >=20 > #+begin_src bash :results replace > =C2=A0 emacs --batch --eval "(message \"%s\" (car (split-string (describe= - > function 'describe-function) \"\n\")))" > #+end_src >=20 > #+RESULTS: > : Type q in help window to delete it > : describe-function is an autoloaded interactive native-compiled Lisp >=20 >=20 > However, there may be a spurious entry in native-comp-eln-load-path > that should probably be removed. >=20 > #+begin_src bash :results replace > =C2=A0 emacs --batch --eval "(message \"%s\" native-comp-eln-load-path)" > #+end_src >=20 > #+RESULTS: > : (/home/user/.emacs.d/eln-cache/ /home/user/.guix- > profile/lib/emacs/native-site-lisp > /gnu/store/4jvap9wxifizm56p6pmxc6rk0zyvm5zc-emacs- > 29.2/lib/emacs/29.2/native-lisp ../native-lisp/) >=20 >=20 > The "../native-lisp/" entry above, seems out of place.=C2=A0 Based on the > documentation of native-comp-eln-load-path: >=20 > > If the name of a directory in this list is not absolute, it is > > assumed to be relative to invocation-directory. >=20 > Contrasting the above with an Emacs 29.1 installation on a non-Guix > system, I notice that the latter doesn't have any non-absolute paths > in native-comp-eln-load-path.=C2=A0 Thoughts? I have noticed this myself, but I don't think that it's related to this series. Can you try 29.2 without the patches? It might be related to that bump. Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 26 02:50:37 2024 Received: (at 67260) by debbugs.gnu.org; 26 Jan 2024 07:50:37 +0000 Received: from localhost ([127.0.0.1]:50172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTGyy-0005ar-O6 for submit@debbugs.gnu.org; Fri, 26 Jan 2024 02:50:37 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:33993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTGyv-0005ac-Kz for 67260@debbugs.gnu.org; Fri, 26 Jan 2024 02:50:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706255420; x=1706514620; bh=YyAiEaPyW78FIwITH0XCCFFgyC4fO+sJKOsKHrmIxZI=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=O0vm4e1rEySol0UskVUkXsctLEDbPukpLrAvANw0qSs82f4raK0mIiWxPo3lMB0J4 NXjA2MTWgtesCR7knlrXt14JKOBlmOcNFrXRhCz8XLjjNSm33os4PjoeXGJ2WtsgGl GAcbXI3Q1fLoAJa9puMIOmzjIGYEMbWzi7Bvmq8WDqtSdSrTpbmtI1bhKVLeTPqrAb uKRYpLiZ1HLfIXl5kZ87+r06Xo9Po8ec+NDhJPYuG+QE9g0RR/ruN7cKHfnY+3Q4i7 /n6O22zgQRjTZBm44dEKYkBG5qlLqqhHslPSg8hVVH1iCybu93/4Xmuij1YKV5ts2B /1g5lxlOYzUJA== Date: Fri, 26 Jan 2024 07:49:59 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87sf2kedp8.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Liliana Marie Prikler writes: >> Contrasting the above with an Emacs 29.1 installation on a non-Guix >> system, I notice that the latter doesn't have any non-absolute paths >> in native-comp-eln-load-path.  Thoughts? > I have not [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Liliana Marie Prikler writes: >> Contrasting the above with an Emacs 29.1 installation on a non-Guix >> system, I notice that the latter doesn't have any non-absolute paths >> in native-comp-eln-load-path.=C2=A0 Thoughts? > I have noticed this myself, but I don't think that it's related to this > series. It seems to be. It's possible that it may also be related to other things already in the emacs-team branch (e.g. if the patch series is only responsible for uncovering a pre-existing defect as opposed to causing it), but the relative path only shows up during the series. > Can you try 29.2 without the patches? emacs-team branch at aae61f54ff doesn't have the relative path in native-comp-eln-load-path. The relative path shows up only after [PATCH v6 3/7] is applied. Hope this helps and hopefully the patch series can soon be merged into master for general availability. [PATCH v6 3/7] gnu: emacs: Don't hash file names in native compilation. --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 26 03:21:29 2024 Received: (at 67260) by debbugs.gnu.org; 26 Jan 2024 08:21:29 +0000 Received: from localhost ([127.0.0.1]:50280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTHSr-0006Nk-7c for submit@debbugs.gnu.org; Fri, 26 Jan 2024 03:21:29 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:48281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTHSo-0006NV-GX for 67260@debbugs.gnu.org; Fri, 26 Jan 2024 03:21:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706257273; x=1706516473; bh=6DqfNHCljadaZanJhS7G+2tEZAdzdHewBXQ36vdGQrY=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=rcdGisFYUeHMIThLv5F80kQ4hskSLeFKoQB2xSS8bG0PT061wP+2kfB16Lvm7LPwD nUcYxj5zrfj5FA2n8Hc0C6S919p4NPZ0D5kEnp708JZRAyVaWXF0w3RLspmASTAQkD 5IsrWh1BMtIfdVO8HnsAvxbUrnj1dLdeUDBvxhzYk1FIVDH/o4lJnLbuR2FyPe5Q8r ChXYdCLYQy7xhmUhBdtptMLhV9giFLLMAPqPrQwhuG+YdP4gx5rEoN/XFUQZaOMfvB +UvVLRsp1VYxWzc7dQlS2mpC/CnQcxXsi55wHvBi8YLMyvWOUZNNXmLt3i8kQKjqAP fLmPYI22Ia/+A== Date: Fri, 26 Jan 2024 08:20:55 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87o7d8ec9p.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Suhail via Guix-patches via writes: > hopefully the patch series can soon be merged into master for general > availability. Btw, does every package require something like [PATCH v6 5/7] or [PATCH v6 6/7] in order for it to be natively compiled? Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Suhail via Guix-patches via writes: > hopefully the patch series can soon be merged into master for general > availability. Btw, does every package require something like [PATCH v6 5/7] or [PATCH v6 6/7] in order for it to be natively compiled? --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 26 11:10:29 2024 Received: (at 67260) by debbugs.gnu.org; 26 Jan 2024 16:10:29 +0000 Received: from localhost ([127.0.0.1]:52506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTOmj-0002Kj-9I for submit@debbugs.gnu.org; Fri, 26 Jan 2024 11:10:29 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:48310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTOmh-0002KW-Ez for 67260@debbugs.gnu.org; Fri, 26 Jan 2024 11:10:28 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-a2c179aa5c4so69049966b.0 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 08:10:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706285415; x=1706890215; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=4ZHIv7rcQFZEm3fyZ+7hRz2gda+sx7kDEAzB5uyI+WA=; b=Oqg66fVybABGJH2JzrWbcJFrGHHG/UbGn9a0swjM3RfkmFfpr7ghsSBK0yT+o3fBNR qPdD6p2f+oYWt2WAiOB5bo6XRF2chRr4yAb3w/U5mU/wYohOQSnGLOBQr0wnMAlj9PRM OqisoiaMYBEzzG/MNtlfMyKAeBGvbrlgfOyx7X3ZQ0gcmaEBU9M81WpeEqTTt+fxR+P2 0WqHEwW7q5wjjUQonG9G/j2kXkNOASobCvUFvG/Jm8/RHOwoB83jPVC+mM2TCP4N8V6k CMOwHkINOugFW9+WVZiz0A7FT5P/iGxRouT9rSridNLPObtVeYU+P+LdrAoNkpC8pkN5 YSLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706285415; x=1706890215; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4ZHIv7rcQFZEm3fyZ+7hRz2gda+sx7kDEAzB5uyI+WA=; b=nRvcvrTXLqVKTOSvCSW8H3LNq421D1tV+MKwG/MImjLvCihBJY4vy0rwK/W8MHZZhS wF8lNT5beTjPBCunKbk8+gb1xM62FdZC3y6N4d1Vw5R5gz1o1QhBDTZmG4B8YJWnt/1j EjQHrm/iH/8rDw/uqMmHQ9p4GVta2k1UDschmUtMyqpf8qkISKGvtmR4dA7Mmk3NRzVh HZkEHc2ruo+1Dq0LUxA2lx1OBENiBxIYKhNsuZs4kezSpa/K3icUUfYvLgFN01Uxmg5S 5mXdohVsSnEcMUJkpB0soNKOGdT6CB01vpQ61f63Iw74mTxqdWP9oNFeYlB/eVaiQ2ye NQzA== X-Gm-Message-State: AOJu0YxbmYwq1wsprieU9VuuZEfl7JE8X4P7sMD+vi4KWHOnnDV0JTt5 8RRbo4Rrcy3A1xZLXEZeeXFemH7iuUnLLKYDAFpRejXkQrqVK8Ou X-Google-Smtp-Source: AGHT+IGZxnJQ3TAbTTsgW3snBzGDUioh5e0BlMQQakL6gfUM9zb2XplxEc6FOKnb0Gbh6WoWutqRjg== X-Received: by 2002:a17:906:68d8:b0:a31:3a85:c5dc with SMTP id y24-20020a17090668d800b00a313a85c5dcmr1039824ejr.51.1706285414724; Fri, 26 Jan 2024 08:10:14 -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 tb25-20020a1709078b9900b00a2caa85c0c1sm768912ejc.30.2024.01.26.08.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 08:10:14 -0800 (PST) Message-ID: <1b318d43c307818b765c41e58cf528ec4a09f9ac.camel@gmail.com> Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. From: Liliana Marie Prikler To: Suhail Date: Fri, 26 Jan 2024 17:10:13 +0100 In-Reply-To: <65b36b7a.5d0a0220.f1ff5.fe0cSMTPIN_ADDED_BROKEN@mx.google.com> References: <65b36b7a.5d0a0220.f1ff5.fe0cSMTPIN_ADDED_BROKEN@mx.google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 26.01.2024 um 08:20 +0000 schrieb Suhail: > Suhail via Guix-patches via writes: >=20 > > hopefully the patch series can soon be merged into master for > > general availability. >=20 > Btw, does every package require something like [PATCH v6 5/7] or > [PATCH v6 6/7] in order for it to be natively compiled? No, these patches are only for natively compiled packages that don't use emacs-build-system. That being said, this is likely an incomplete list. Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 26 17:46:20 2024 Received: (at 67260) by debbugs.gnu.org; 26 Jan 2024 22:46:20 +0000 Received: from localhost ([127.0.0.1]:53006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTUxn-00059J-VD for submit@debbugs.gnu.org; Fri, 26 Jan 2024 17:46:20 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:63135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTUxl-00058z-7V for 67260@debbugs.gnu.org; Fri, 26 Jan 2024 17:46:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706309163; x=1706568363; bh=+ZgMSDLxWNYPGY29kgdFZQy/JHmfZMRY8kVDdSigVYM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=VJL6k4w5RFspp0uDVEPFwm/vg/fWAtq/OdtHap6wtFExXX8e10/eLv86le1XKeVo9 0ImCaKR+5MwLF+k2Npqb5rWkfaHTd7va5LjLKvMhu2g+QcvuCiqJKVbCuEsBm1dLk0 +AkPk12ZVM5RhhhDffvGNwWHEQkoGc2tvs0mS4a+hdC6hKR+1YBmQZd2hnxhgJgvhf U0WBKzzwtJCEfwMroJpFslXCUuAx+f9oJoSnEFrfx7/uNN355ww4TZ5xdZV6Hm0L1G sstiz6UHWNS+/gHCGa2TN7sh5qVx4prV8TpBaZUWLkrjMuhg65QzWiQhvIg70h8MPN rJCrihQIE+F+Q== Date: Fri, 26 Jan 2024 22:45:42 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <874jezemss.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Liliana Marie Prikler writes: >> Btw, does every package require something like [PATCH v6 5/7] or >> [PATCH v6 6/7] in order for it to be natively compiled? > No, these patches are only for natively compiled packages that don't > [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Liliana Marie Prikler writes: >> Btw, does every package require something like [PATCH v6 5/7] or >> [PATCH v6 6/7] in order for it to be natively compiled? > No, these patches are only for natively compiled packages that don't > use emacs-build-system. I.e., any and all packages using the emacs-build-system should be natively-compiled? If so, I believe I've found a counter-example. After installing v6 series and building emacs-htmlize my expectation is that functions provided by it, such as htmlize-buffer, would be natively-compiled. However, I get: > htmlize-buffer is an autoloaded interactive Lisp function in > `htmlize.el'. Note the lack of "native-compiled" in the above. --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 02:01:06 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:01:06 +0000 Received: from localhost ([127.0.0.1]:53323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcgb-0002Qs-Vd for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:01:06 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:46351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcgZ-0002QE-E3 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:01:04 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a3536102785so25498566b.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:00:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706338850; x=1706943650; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=k16+yDRjfSAARkoPKPRDVTbVzQPGi4VUMHnlToEAfTU=; b=bZFoWhIW+sptOurxoMCWKA9wbI2cCzSN8d0kJwxR8CJmZT2Hpm6rihSu2HWirVm+we N83TXF8UWMM8FiFKuR2uPSUiAfqfYJDxo+kN7YsserwRhQsKQWiAhWEa01C9vjW2kXrs jZwgDJe1VFN0gs815ci86z1A8rlYLDQGvodVxOAO6F+F+WJWyCP7S+v5W7u0P+im1i4c UD3d+O5xgegXA28dn3owffvR7EWf9JBKvWeTmWpuKmBXz62XErCpzp1VJCOG0GW85qSB 6Wen7GRNwixag4FBuYlCAYuZHT3o6hdX2UQO4WRcVUUscLcpzSW+yDSP3lIavr5R+SqG bJdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706338850; x=1706943650; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=k16+yDRjfSAARkoPKPRDVTbVzQPGi4VUMHnlToEAfTU=; b=PMBVURzDtn20Mc9sz9udzPBZwTEJFCcFeKdASx+driX+7n7HUYiMPBPPuozJLlODt9 zJLts/EF0UsFHHzWlqLQibvC8ps/sSS0VQcLK7AiJxOQvJdqKdL2NBGIBW6JVNbVS94s dmrKJNQqKGIhdKXiTsbpQGvtq4ThbxchiKIY5A160VDw+zp+i/QB9AE0zcK4NXEAELsl GSGQyNF8qxx1foep0Le5BF1lAfgLiumk2F12Eldlx0C6vQ7dTwjQl94vzAxtL6e5hgDi yUahby2IOt5KArQ6rYGvcY3bBdDWiklpucWrh7YNFuNlS/5vQO5AzH4Nt5aKtftyZ69C Kw2A== X-Gm-Message-State: AOJu0YxKT+r9H2kdXBPb3KzKoDvFV/AH+oQXjAutf+PXsXzj2URuETea lY7n5WsZvP0Mc4EBmi3XTys6FoAmKf8aPruWDcoj5hjfKUwRFXBP X-Google-Smtp-Source: AGHT+IH1xrtKnbUHO12k5h3cRkiYqvMPYWqa0J3er4wxEWfXjnC4d8yqLOfkxDYcAULntTYS2A3Hiw== X-Received: by 2002:a17:906:5607:b0:a35:4409:f5b9 with SMTP id f7-20020a170906560700b00a354409f5b9mr154211ejq.45.1706338850373; Fri, 26 Jan 2024 23:00:50 -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 o14-20020a17090608ce00b00a317f2388cfsm1432137eje.195.2024.01.26.23.00.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:00:49 -0800 (PST) Message-ID: Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. From: Liliana Marie Prikler To: Suhail Date: Sat, 27 Jan 2024 08:00:48 +0100 In-Reply-To: <65b4362c.050a0220.0774.bd29SMTPIN_ADDED_BROKEN@mx.google.com> References: <65b4362c.050a0220.0774.bd29SMTPIN_ADDED_BROKEN@mx.google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 26.01.2024 um 22:45 +0000 schrieb Suhail: > Liliana Marie Prikler writes: >=20 > > > Btw, does every package require something like [PATCH v6 5/7] or > > > [PATCH v6 6/7] in order for it to be natively compiled? > > No, these patches are only for natively compiled packages that > > don't use emacs-build-system. >=20 > I.e., any and all packages using the emacs-build-system should be > natively-compiled?=C2=A0 If so, I believe I've found a counter-example. No, but packages using emacs-build-system should not need any changes to accomodate the currently existing hack of adding the option=C2=A0 --with-input=3Demacs-minimal=3Demacs to =E2=80=98guix build=E2=80=99, =E2=80=98guix package=E2=80=99, =E2=80=98g= uix shell=E2=80=99, etc. > After installing v6 series and building emacs-htmlize my expectation > is that functions provided by it, such as htmlize-buffer, would be > natively-compiled.=C2=A0 However, I get: >=20 > > htmlize-buffer is an autoloaded interactive Lisp function in > > `htmlize.el'. >=20 > Note the lack of "native-compiled" in the above. If you compile with emacs-minimal, that's the expected results.=20 Different builds of emacs are still incompatible w.r.t. native code and produce directories with different hashes. We'll have to see as to whether this bugs grafts, but I'm hoping it doesn't. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 02:04:20 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:21 +0000 Received: from localhost ([127.0.0.1]:53329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002W5-JJ for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:20 -0500 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]:55297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcji-0002Vf-MJ for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:19 -0500 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-5102e2ab56eso295799e87.2 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339046; x=1706943846; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=SWvRJBgRnNr3LQLoUq1Xn3YgJvO0XhnKjND/itlKcgKOGZu8Rxt9fAv0kx8LyA9mol SRzIO3wJahc3VkeuCyNykIMr7QFBHPuH6iCcsdBXF7OfK3YyOlZrl+FZDKhAc84JY8zN Cwcz9Owv6x6xRvnMl+rRoRWoA1CKx3CSzcyvnIq9iid/sm94cdT4tHMr+GR/cl3kukZw I+p+kkKvFOiZY30izW34bmo2JAueQIqeVfSKZC+JLw2Vculu8baDaJvrGK7eCScd7HYN ZkpIwZaxGo+jE/0LrYKOMQw7p/RHfI+QWHXjtQ8QV7TWzmYxp+QVaScRRsRqRVGjTw85 I31A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339046; x=1706943846; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=bF6COgba9FiUINq5zFMbnfbjsx1Jltegig5BqCVUzPCfG7XbhKCMRSRl9dYlAyhuF+ +JHtIMZocm3jcfAGVQkpo8O5KEZSxjn1H5rkDo8mWc/eIjxiKH5QO5o6hFYna/zKPJBR Dwwl5dyKJoDOUdaehIT+/Pwf2Q5vAJfOVm+yw3WTbtD7PwPwmU4CHMfqc0OVBMroW2Li l+TuX/3eE1Ct0VO5EfzWaAMNAyZ/PynmE5dlx4zzG2xbo2sD1rBWl6akgoa7Ha/2A7cZ 2xOhzIK330Am78aJRCoDOKL/sSFGGy7hZpmkto3Sh/k6z0oLIwNcYiG3yGS3n4CawAGI /pBw== X-Gm-Message-State: AOJu0YxXr3pHXR8w5TsPR+ZIY3XPsNXYII7bxKKDngduBDv5kkn7v/IO I1fF3HtxNvj0mNVcBuPHTdGTx14MOC0jq78g0+YhuO0+d0r4FinR9hqs2iYR X-Google-Smtp-Source: AGHT+IHuABlkleAdsqtzfvqjhcfdMJSsQXSQ88IOc2dEGC+d9JlWSrNKfPtzL1zng0Gyg+/pshUCPw== X-Received: by 2002:ac2:546f:0:b0:50e:2c05:5773 with SMTP id e15-20020ac2546f000000b0050e2c055773mr514355lfn.27.1706339045482; Fri, 26 Jan 2024 23:04:05 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:05 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Mon, 22 Jan 2024 21:21:26 +0100 Subject: [PATCH v7 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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-min [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:131 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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-min [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:131 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 02:04:21 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:22 +0000 Received: from localhost ([127.0.0.1]:53332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002WA-VP for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:21 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:50466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjj-0002Vg-8C for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:19 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a28a6cef709so104689966b.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339046; x=1706943846; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=f71EHqCsPHTuBPBjV8KqQmr4ph820bUgFERw5uItS4mTTNetQ5gJXG7Ku5Xm0iuS5Z dgPM7kBB+puTSmRUBngK8tr0vuNR129JTEm97OAiDQucBbC1D5PZNC1D5Hp/Lkh8Aguo d682hpeTYt0iQBCveamVtsslSgflWEkjkR3N3PYwRcFbl8JjElfNlSK2iRnGWsfKXzsh 9yP962CGoA4GeJvuYve0ssfcJD4+FtlLCKh0tYQzy+j1cxoPM6ZQbWGCS48swtMHx/nt vUCXEc93VQyOYBse3y5NvgOOQjS0mXHX4bPpXLwq5RFrJScbpQEq6RVlsFJIj50NTAo3 A/AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339046; x=1706943846; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=daZOF4nxKQyhU8I7yW2j4nYwn4IHsbd9AjQVXYx5m4r+Iu2pNMtaFhg1muWWP+gRUD ewkcKrJMJ5wyVkzZgsOqXHwMqIHNoaczoVkoIdG7lgW/7yLvEZ6sTdzv1+lmORHg0DBB PtztUc/rrUCEskSx+VM3kU26j7Tyj9RAe1/vE00HVWuBFeWnTIOMzJgRFB+vR4gnJrLC 42OMwps3TMDuHxuwwNht1sTmN8XMlMTcjuHFlWIrBP1EsQzljIZaQ+PfGmXjbz2jFftH /pLi3Jusl0FrTlmul1SwU7/KuDdqjI6uX8+QS5yrLKMr3Lm4ESNw1jdigob7QSG+/jDl 56Nw== X-Gm-Message-State: AOJu0YzhQj+nyiroyII2HW8tn+xF+xE++V7I7gPuNV72WlWdcVS+b7W5 AUUwFws8VHABGZdYBu5+yrfpkcntPvP+Sxk+rWBdVyqi+3baFE6rtm6SOZ3nBSo= X-Google-Smtp-Source: AGHT+IGvwhGKnxiRPliBvpv+Lnwro06ilNXr+n8OIYAfhLJMdGHV8TqFjQuHxWexPULtSvekCIxWCA== X-Received: by 2002:a17:906:470a:b0:a34:e324:c8d5 with SMTP id y10-20020a170906470a00b00a34e324c8d5mr548161ejq.33.1706339046403; Fri, 26 Jan 2024 23:04:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:06 -0800 (PST) Message-ID: <75fc54d6051c02ab2edc333de71ee4689a287ed0.1706339016.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:41 +0100 Subject: [PATCH v7 2/7] gnu: emacs: Build trampolines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:642 listed in] [list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:642 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 02:04:31 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:31 +0000 Received: from localhost ([127.0.0.1]:53337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcju-0002X0-Uq for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:31 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:51355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002Vk-M1 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:21 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a271a28aeb4so98549966b.2 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339048; x=1706943848; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=Vt++/W1dbR9c56TQb7mnpLXVe1L6Z1scYX4xVYtc++TisR1K/q1RmEWKVBH683hJT+ qOPGTIdLJ4+oYVI4xHqy0OzNFRvp/5uqitbJqXDFL6sWokX3CdS4IsQ2xmK7ilJSjI3d 39K3Nx/2fmH5OOZYV+/My7jlBsKxNnaQ6iEV2LoMv4X6WqKPLSDPctNxjsrw6qq88DVU xcrYbUWIXeYjLD4uOO/Suxi9LuIPVRIW0ZrYKKV7WQss1InBZmQaun/nenyka2ex/6ci nj8w+zVDk5Z26JXnWJa/tJsuGrhgdPI+xAncXwnsEjEGydydq6ZJLmtfUyn4FmyKLhLn tDIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339048; x=1706943848; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=m/hKi6BJOGgyoxKzGRKTS3xSCpplj7/GthA5FXCsXlnCzeoog/M6J25gnhP4cVoA8c 5ML75XPz7/8Yzgj2kiMrxq3rSqKIeEr2tlwhjZVGvVd2ThPiMjlW0tca/YlzEsB1Tc7v LTs63IVcM/JeeysWWYD/u0ohbFYXLC/gG3ZhnBAAFQgfdpzNbG8NQx6WWHj0fSZFXmbk smiev1rd2m0DRofg/cjEHdCpWX0ZWH7bmKh4N1Zg2U2Xp8eIIwewoGlCVURuNzI9qlpP DzgrH5VVNH8fg4QLrAwlhbDUhD3WYAO294JyB6AH7OdhTdnWe+GZOxuCqavMX9eF5l7x hgFg== X-Gm-Message-State: AOJu0YzPW3v7T6WrYdL6nnClqGmBq6kEmbPULph+RPj4K8bULglfeI/I dAe5bwp+I8afJYl1dYF65/YKVGc3AasRjsDqvPHHWz02UMAD9TH+AiIfAuxOujI= X-Google-Smtp-Source: AGHT+IFtl7dB5ODfNIrGKoZtJbuuq04x6rLExEOsqDYxCiaPvutTlb9XOw7TRcK4HRuNeU+VmYe37A== X-Received: by 2002:a17:906:470a:b0:a34:e324:c8d5 with SMTP id y10-20020a170906470a00b00a34e324c8d5mr548185ejq.33.1706339047844; Fri, 26 Jan 2024 23:04:07 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:07 -0800 (PST) Message-ID: <61d7784b8133fe9e806f0c88a66a88c62772f35d.1706339016.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 15:09:47 +0100 Subject: [PATCH v7 4/7] gnu: emacs: Disable jit compilation. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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. [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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. [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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"); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 02:04:31 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:31 +0000 Received: from localhost ([127.0.0.1]:53339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjv-0002X2-Dz for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:31 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:46357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjl-0002Vl-CI for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:22 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-a3536102785so25697466b.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339049; x=1706943849; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=k45B4uBi36tCwsquiZvPWeYUFX805MzT7rpjsJSwNl6VynmltenLgSfeey9YFtNCA/ JSUawGMRGUzXc/+tdaz9DK26Bcu6ATqM3wws+IzspDmtBLpm1tNZc4pl8ncsVF/Fmcyl 93R0GQMYrK8IGoF2eIzuJ/AcPv2sCW1aXCOv40iY1684YntZCxW9fmxLdyf+SE2/SeBI lcYVgB8p5flbW8NW51tbBolRBZUdHxW8YTeq+6NoiQvHobcz1Xwu7+QUSWLJrl/TR3+a pAHBUtMXSviRGEuERcpt+HvUbeI9zfbAjiJhUOhhbXaKuhSjEbflie5/o1x6Sm5cjqiR XLuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339049; x=1706943849; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=E+QpR0BkDez6g9cYiL1SUSFcZ30C+ca1hatSglw+EU9NI4ZtFKZpiUNP5FIB2mDJAf 0uixNoeb4uezMjwLupuCNbRZYmbf41o7QV3am6E6lZY9dkEuXSFP/0mXhcBAAPXj/mS/ LRnVRagsKnxyh20utP9javHQzjW8e9u2RH8L9dZ4/OepkzOn1j6s6nxz0t9UASl9snNy x8ixhhRQXgm+4W+CX74s3V8Iq8H2yS3+NyHvULm7o8nmavDLfv3d5UFR8JbsWOuz0/Dx Q1tuHQTPlEaO6gGID/1rJovSB9xWGeXM2yXnkG5249yfDt2rbHOtC4zC1q8xJYt5cCtY xt6Q== X-Gm-Message-State: AOJu0YzXz3DV6nzK/DvK2NQoMBJDo77GbivLRm2/m9G8YIh8wJIza4VU 4PaUoF+u7LfL3o2FtNoigIOuNrzS87M2Z8g5p0bXEWrGqy5RyaZSq2IcBBtB094= X-Google-Smtp-Source: AGHT+IHocwoV4F+qnJpcfeTmdCMhaeGoFofNgcefM0flGEhUPh/IjImedWg1SH3dnGbJb+xbObJ1YA== X-Received: by 2002:a17:906:4ada:b0:a35:50c5:2038 with SMTP id u26-20020a1709064ada00b00a3550c52038mr115212ejt.6.1706339048671; Fri, 26 Jan 2024 23:04:08 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:08 -0800 (PST) Message-ID: <174b0112dccebee22b08fc6931980766c0653c1f.1706339016.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v7 5/7] build-system: emacs: Compute relative file names. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:644 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:644 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 02:04:32 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:32 +0000 Received: from localhost ([127.0.0.1]:53341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjv-0002X9-P6 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:32 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:50478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjk-0002Vi-64 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:22 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55a5e7fa471so818315a12.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339047; x=1706943847; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=6ub9A6wmgZZ69IN8DL5mrbWBIpsOdhkK0mC0Jif3FTI=; b=Fw7I9w1aNZkSRe/peNIQ9ZVkxzjpQNeRSCA6JFLLAeDQV1QVkss2HntI0mLgHdvxIA 1tvTjXv/AkIXRIBA8Vk88lfdndP46wU6rnpZSJrbAzBcAdCA/hvc+f5hkyBcUW4csK/X //tDPMpCW07NEGoPhMCP13DNLlrmdWXHhPsHuRQHrQ3uuTQ5D0guZyfX9jKG6ja3AG17 7M0xuVD6nvmVqFA+we/l2thJUZ2uwmZOxucztSSrNuIierjbwxPMLM5KhED4CDpGvfcj 93vINzWrYD4oRddubi2j/Hp4j0GZzWOqHOzJar+0I4fNRLR0Em1PHkgz6gdV15uHQ1/o +jOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339047; x=1706943847; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6ub9A6wmgZZ69IN8DL5mrbWBIpsOdhkK0mC0Jif3FTI=; b=a3IJ029mjpaEawoxYLS7Mk5Owed6FJCJWuKNONaENtUdQl6DKNhlo+z5j4/iiw32Tn 8itEeXZjhAHuoBfBu7sRTV/aeW8+sw8WjFspzXoEMJm4GicTy9y663AN1Tlgs7/HEMVs gOdM/6Nk2Q31VsPzY6jotqy/zh/5cyJ+s0OPrY13h1gSb1ZCIE75t9R2s2V8p7ipifNa E4U1GWldiMIRWSdiw77txzarASRPmW0NJb2Tw2oh8HAushJc001f0PIK2x+QyPQaRJUc HVRIMzfipbud4EuLPRNB4+7oc3LeNy/sZk1xWSKdrOnElNjsQvc1Bmg3Tld+Pgk8KyX1 3vOA== X-Gm-Message-State: AOJu0YzQnQNtZhC+xJSe6siETNjKN2L9ZsTh+1HAQkvGV7SYBD7cp/BC gS+FtuOTAAiKqvaKDElT7r32rX4QBJKkmVQzev/yxffiN0E+hE7KjQlSk5+0LmM= X-Google-Smtp-Source: AGHT+IHUsaCTL8ALMVcb05EU3qd1v4t63zvXAuxTRk3wVj62/hKEXK7AAUK1VBZQu1Rn0cM93NkKig== X-Received: by 2002:a17:906:3614:b0:a35:2736:1962 with SMTP id q20-20020a170906361400b00a3527361962mr641325ejb.22.1706339047099; Fri, 26 Jan 2024 23:04:07 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:06 -0800 (PST) Message-ID: <2093303b8a10981cbc420e90f5912d49b39146e3.1706339016.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v7 3/7] gnu: emacs: Don't hash file names in native compilation. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 291 ++++++++++++++++++ 3 files changed, 293 inserti [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 291 ++++++++++++++++++ 3 files changed, 293 inserti [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 291 ++++++++++++++++++ 3 files changed, 293 insertions(+) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d1afd4555..7e6a0c5006 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1121,6 +1121,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0292b1bd16..1caa2cbee0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -111,6 +111,7 @@ (define-public emacs-minimal (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" + "emacs-native-comp-fix-filenames.patch" "emacs-pgtk-super-key-fix.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch new file mode 100644 index 0000000000..d4bddc5901 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,291 @@ +Upstream hashes both the absolute file name and the content of a file +to derive the name for the natively compiled files. This breaks the +staged install used in guix, as any $GUIX_PROFILE is distinct from +the build directory. It also breaks grafts, as hardcoded store file +names get rewritten; thus changing the file hash. + +In addition, this patch changes how native-comp-eln-load-path is +constructed. Upstream, an entry of the directory “../lisp” is added +supposedly for bootstrap only, but this directory appears to find its +way into the actual variable despite attempts to remove it by calling +‘startup--update-eln-cache’. +The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as +packages may require it, but only pushes the new value now. + +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -4396,26 +4396,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc + Scomp_el_to_eln_rel_filename, 1, 1, 0, + doc: /* Return the relative name of the .eln file for FILENAME. + FILENAME must exist, and if it's a symlink, the target must exist. +-If FILENAME is compressed, it must have the \".gz\" extension, +-and Emacs must have been compiled with zlib; the file will be +-uncompressed on the fly to hash its contents. +-Value includes the original base name, followed by 2 hash values, +-one for the file name and another for its contents, followed by .eln. */) ++FILENAME is resolved relative to `load-path' and only the suffix of ++the first matching path is kept. If FILENAME is not found to be relative ++to any directory `load-path', it is used as-is to construct the return ++value. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); + +- /* Resolve possible symlinks in FILENAME, so that path_hash below +- always compares equal. (Bug#44701). */ +- filename = Fexpand_file_name (filename, Qnil); +- char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL); +- if (file_normalized) +- { +- filename = DECODE_FILE (make_unibyte_string (file_normalized, +- strlen (file_normalized))); +- xfree (file_normalized); +- } ++ Lisp_Object rel_name = filename; + ++ filename = Fexpand_file_name (filename, Qnil); + if (NILP (Ffile_exists_p (filename))) + xsignal1 (Qfile_missing, filename); + +@@ -4423,64 +4414,53 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } + +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; + +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); + +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } ++ } + +- if (NILP (loadsearch_re_list)) +- { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); + +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) +- { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); +- break; +- } +- } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4474,7 @@ If BASE-DIR is non-nil, use it as the di + non-absolute BASE-DIR is interpreted as relative to `invocation-directory'. + If BASE-DIR is omitted or nil, look for the first writable directory + in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory +-whose name is given by `comp-native-version-dir'. +-If FILENAME specifies a preloaded file, the directory for the .eln +-file is the \"preloaded/\" subdirectory of the directory determined +-as described above. FILENAME is considered to be a preloaded file if +-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME +-appears in the value of the environment variable LISP_PRELOADED; +-the latter is supposed to be used by the Emacs build procedure. */) ++whose name is given by `comp-native-version-dir'. */) + (Lisp_Object filename, Lisp_Object base_dir) + { + Lisp_Object source_filename = filename; +@@ -4541,19 +4515,7 @@ the latter is supposed to be used by the + + if (!file_name_absolute_p (SSDATA (base_dir))) + base_dir = Fexpand_file_name (base_dir, Vinvocation_directory); +- +- /* In case the file being compiled is found in 'LISP_PRELOADED' or +- `comp-file-preloaded-p' is non-nil target for output the +- 'preloaded' subfolder. */ +- Lisp_Object lisp_preloaded = +- Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); +- if (comp_file_preloaded_p +- || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), +- CALL1I (split-string, lisp_preloaded)))))) +- base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + + return Fexpand_file_name (filename, base_dir); + } +@@ -5859,10 +5821,7 @@ The last directory of this list is assum + the system *.eln files, which are the files produced when building + Emacs. */); + +- /* Temporary value in use for bootstrap. We can't do better as +- `invocation-directory' is still unset, will be fixed up during +- dump reload. */ +- Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); ++ Vnative_comp_eln_load_path = Qnil; + + DEFVAR_LISP ("native-comp-enable-subr-trampolines", + Vnative_comp_enable_subr_trampolines, +Index: emacs-29.2/lisp/startup.el +=================================================================== +--- emacs-29.2.orig/lisp/startup.el ++++ emacs-29.2/lisp/startup.el +@@ -545,9 +545,6 @@ DIRS are relative." + (defvar native-comp-jit-compilation) + (defvar native-comp-enable-subr-trampolines) + +-(defvar startup--original-eln-load-path nil +- "Original value of `native-comp-eln-load-path'.") +- + (defun startup-redirect-eln-cache (cache-directory) + "Redirect the user's eln-cache directory to CACHE-DIRECTORY. + CACHE-DIRECTORY must be a single directory, a string. +@@ -558,22 +555,10 @@ to `user-emacs-directory'. + For best results, call this function in your early-init file, + so that the rest of initialization and package loading uses + the updated value." +- ;; Remove the original eln-cache. +- (setq native-comp-eln-load-path (cdr native-comp-eln-load-path)) +- ;; Add the new eln-cache. + (push (expand-file-name (file-name-as-directory cache-directory) + user-emacs-directory) + native-comp-eln-load-path)) + +-(defun startup--update-eln-cache () +- "Update the user eln-cache directory due to user customizations." +- ;; Don't override user customizations! +- (when (equal native-comp-eln-load-path +- startup--original-eln-load-path) +- (startup-redirect-eln-cache "eln-cache") +- (setq startup--original-eln-load-path +- (copy-sequence native-comp-eln-load-path)))) +- + (defun normal-top-level () + "Emacs calls this function when it first starts up. + It sets `command-line-processed', processes the command-line, +@@ -1362,12 +1347,6 @@ please check its value") + startup-init-directory))) + (setq early-init-file user-init-file) + +- ;; Amend `native-comp-eln-load-path', since the early-init file may +- ;; have altered `user-emacs-directory' and/or changed the eln-cache +- ;; directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + ;; If any package directory exists, initialize the package system. + (and user-init-file + package-enable-at-startup +@@ -1502,12 +1481,6 @@ please check its value") + startup-init-directory)) + t) + +- ;; Amend `native-comp-eln-load-path' again, since the early-init +- ;; file may have altered `user-emacs-directory' and/or changed the +- ;; eln-cache directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + (when (and deactivate-mark transient-mark-mode) + (with-current-buffer (window-buffer) + (deactivate-mark))) +Index: emacs-29.2/src/Makefile.in +=================================================================== +--- emacs-29.2.orig/src/Makefile.in ++++ emacs-29.2/src/Makefile.in +@@ -553,6 +553,7 @@ shortlisp := $(filter-out ${shortlisp_fi + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. +Index: emacs-29.2/Makefile.in +=================================================================== +--- emacs-29.2.orig/Makefile.in ++++ emacs-29.2/Makefile.in +@@ -329,6 +329,7 @@ TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. + unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++export EMACSNATIVELOADPATH = @abs_top_builddir@/native-lisp + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 02:04:33 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:33 +0000 Received: from localhost ([127.0.0.1]:53343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjw-0002XH-Ns for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:33 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:54276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjm-0002Vq-Fy for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:22 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55d2d9fe0e0so957777a12.0 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339050; x=1706943850; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=LO560fD+6BrpgFPX/tTDtcDJHFs7ezu7Ti/qRBlfMwbYG6IeQnDn2J9pfj/stwUb52 QzBdp++AEYj28Op38Q/IJlWU1GkgHlc2drr/WPzrEdPgqofX1yXuACUvFk+QMHz1OjO5 Bt0TjT5ZzEeutPhvLK3mejYvTg+Z9CjI22/lxOuUI8YYOeo8xcQqbtsoiYqAwrQ/Fbjc XyzxbI4nypiYiJJnrTrs7yBFkdd0PdqR9f7Q0T0qKPTXniWPpds5vWeHk1QiJjRZZNrX kqF/U8pMW0UxY/0lAGxedcJOqcUu8DJGkgxczATEWSN42u3CT0eoKwZ1fikmqpjzfZor ObaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339050; x=1706943850; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=aFnfYCQEcJKOijws3CM9MbcknHR/qE+kr4xrf8Buhd4zXSyYW+H7vCv6ug2CQ32Bcf rbi0VSc3koYw9E8kMZvT8C8XWg7qtqiDJSFZJsl2xiInTpSZHbpqBBZ+jpZ+TDRNuY8t PbsX/kyPHErkjVbsY9RNoWsaffQJ7wfeJGKGISjN+IKQEr0Ij5OlIw2MgdMVZLuYolIJ 66lj0yTNue3Oxg6I5V2rqimtpIHDzJ2T+wdow+C1mGCao+419T+y9wcQC3ieQyA/i5dx 0k8XY/kPlM3akZdYt5CZLc+3iDFcgmoe4D4jDyMYlVdjym1bjgFJcDUoYZOL+kbI5eSz 9ouw== X-Gm-Message-State: AOJu0YzcnqJtOCLKe+jz7UR1BXV3K4L66F3I6TPC1DSOFWpiscMpQKLK p0TVY5GWLY6himVavjU5eDIId+Kwuq/CY8snSu7q/r4u6eEReqmgXVU1ZmAyuhs= X-Google-Smtp-Source: AGHT+IGMM+n1ZUrDbRtRgKKxCNynQfy4iNzdxbbg1wEDYBry9q2nnmOjc7cZ67K7RLaWVXyK3Nmo6w== X-Received: by 2002:a17:906:ca92:b0:a31:3a5d:c853 with SMTP id js18-20020a170906ca9200b00a313a5dc853mr540019ejb.49.1706339049599; Fri, 26 Jan 2024 23:04:09 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:09 -0800 (PST) Message-ID: <035c884186662330fe3a3d72153e8d57046df525.1706339016.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v7 6/7] gnu: emacs-org: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(+) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(+) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 02:04:33 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:33 +0000 Received: from localhost ([127.0.0.1]:53345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjx-0002XO-3L for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:33 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:46358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjm-0002Vs-Ui for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:23 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-55a86795a3bso709296a12.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339050; x=1706943850; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=aBF9uMm6UNUiR6GeOppIeC2F45I+WpCiPg9O7WZGH0RluW+sYkQyGbDq6Ya4seC6vG E762G/UH/NMolQC68uCPt/WyHIeO0/nlFTa9VYdag9TXOsrwrYA1wbSRB5TzTG5pL8oP /xY6FrNPbwUoiVhbToiUdJD2UdbwHZcbf7nhyQJPsYrmvfZoJ7u0V6HJ4jB+V/FQRdwL TTpnRXTzE2y8xtlM8sMvrryPpCPItlhoZ5IOlYn/7Vc7Lk742WjuUL27aK7Ff0cE9YKd zZkpASbwkYzIA4E34BB5w9caUDmU95jJGFGJNycVLdQlQmWHCFf+7oEIudzqFof/NPOR NP0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339050; x=1706943850; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=HQK7J6CXOK4IYYcQihA5Td08DWRjppSbKiGezoWKm0zBl23/u7VRk1L1ppzgdaicwk vLDg/2P/oFUkVE3XCU9m/Ex3Xe2bC4JEIeZaGtRGebh2cgjELDwOUSIw8Jp7HPjKAz39 NshOj16YUc5myQbEwFHTx3/+YPQoy9XKpeBlHPfQVxeDhS2BTl+aa4uFTcnU0iYmodAl qq+ji0sA8h+lLs3c/vbj5+qF0JBJo/fxblj02tb1QzFS9rSrVygUUDIKNU+OJ1Oa4MFR ZCz4tY7QOEigTIhX70E+y4JGzMO7Yy/YigF5UulGS8PsgjIeGc/yy5NWGYaBUw1Sxz2m SziA== X-Gm-Message-State: AOJu0YwcjixqYPDxlv7QDStwxjYFuDHCx6ShQ5RgVUZoBdcP86g8GTCm dUrn1AbV37u/k4xeEBDtg9Te+UsTs3krdKbXPy02vbEpJ/kN9rL9xcL4IjsYNNc= X-Google-Smtp-Source: AGHT+IG3Qgbu7eWRYnKUFQ8fCua7GupfsyeM+6/gvlmA5Dy/DnV72HnpVqD9uccWED4bKfSecofhUg== X-Received: by 2002:a17:907:170e:b0:a30:8d7c:4e85 with SMTP id le14-20020a170907170e00b00a308d7c4e85mr540944ejc.35.1706339050374; Fri, 26 Jan 2024 23:04:10 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:10 -0800 (PST) Message-ID: <000095599a15a189aeb1063d433d5105b9bca698.1706339017.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v7 7/7] gnu: emacs-magit: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:543 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 10:36:32 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 15:36:32 +0000 Received: from localhost ([127.0.0.1]:55728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTkjP-0003wI-Ky for submit@debbugs.gnu.org; Sat, 27 Jan 2024 10:36:32 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:55553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTkjM-0003w0-7m for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 10:36:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706369773; x=1706628973; bh=YTXjbXJPemcGz6dah4hBjuigQL8nXxp393nn/D+PHyk=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=tTHW4cOPi+/xpSrrCpWHLPdUAFGxRt5g9qzVlF+oCjAlcnDkPbyP/h55YazDkx7qT O6rHFMFKQudCJ1jz4bcnE/Lxy+gi+pSCIsyVnHs5I7rZERN/e/vol67/UZNWXh69Hv qnsn9gjT9KJIUull1Zjt696vU3OjVvYjpy0JBLhPzzSHjb/it20dfSnnkLev4N0tTv vBx3fO3V6sziwDUDkp08VsIW2yPjHU9fN/xKHYFJa7xwN2Cp4XAvE2MtIyHj5Ag+H7 0Lssj0KGvu/+JGUlu8EF/LCrUi/aCmJT9uXmSEfqGAWjoREWua7KHMjU3HH3/bGPpQ wb+csIdj9CXYA== Date: Sat, 27 Jan 2024 15:36:05 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <871qa2aivy.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Liliana Marie Prikler writes: > If you compile with emacs-minimal, that's the expected results. It was compiled with emacs-minimal=emacs. For reference, I have inlined the manifest file that was used (with the --no-grafts CLI option to guix-package) towards the end of this email. I'm sharing the [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Liliana Marie Prikler writes: > If you compile with emacs-minimal, that's the expected results.=20 It was compiled with emacs-minimal=3Demacs. For reference, I have inlined the manifest file that was used (with the --no-grafts CLI option to guix-package) towards the end of this email. I'm sharing the one that was actually used, but it could be minimized. I believe there are two issues (not including the spurious entry in native-comp-eln-load-path which may already have been resolved in v7 of the series). All my observations below are based on v6 patch series. For emacs-htmlize, I believe the issue may stem from the fact that some .eln files are available from entries in native-comp-eln-load-path only via symlinks and the .eln loader may not be able to load symlinks. Packages such as ox-html are available from two locations in the native-comp-eln-load-path. In one location they are symlinked, but (presumably because org is a builtin package) it is also available from another location in the native-comp-eln-load-path and in the latter location it's not symlinked in. I believe this difference is why for some packages natively-compiled versions are loaded (e.g. org, ox-html etc) whereas for others it's not the case. In addition, I believe there's another issue. Some packages' names are getting truncated. For instance, instead of uniquify.eln, I observe niquify.eln. In this case, the .eln isn't symlinked (presumably because it's a builtin), but due to the name being messed up (perhaps too aggressive a truncation of hashes?) the natively compiled version is not available: > uniquify-item-p is a byte-compiled Lisp function in `uniquify.el'. The manifest file that was used is below. #+begin_src scheme (use-modules (guix transformations) (gnu packages)) (define transform1 (options->transformation '((with-input . "emacs-minimal=3Demacs") (without-tests . "emacs-clojure-mode")))) (packages->manifest (list (transform1 (specification->package "bash")) (transform1 (specification->package "coreutils")) (transform1 (specification->package "git")) (transform1 (specification->package "make")) (transform1 (specification->package "emacs")) (transform1 (specification->package "emacs-org")) (transform1 (specification->package "emacs-org-contrib")) (transform1 (specification->package "emacs-citeproc-el")) (transform1 (specification->package "emacs-engrave-faces")) (transform1 (specification->package "emacs-haskell-mode")) (transform1 (specification->package "emacs-htmlize")) (transform1 (specification->package "emacs-markdown-mode")) (transform1 (specification->package "emacs-org-pandoc-import")) (transform1 (specification->package "pandoc")) )) #+end_src Thank you for your continued work on this! --=20 Suhail This email is not an offer capable of acceptance, does not evidence an intention to enter into an agreement, has no operative effect until a definitive agreement is signed in writing by both parties, and that no party should act in reliance on the email or any representations of the sender until a definitive agreement is signed in writing by both parties. From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 11:25:15 2024 Received: (at submit) by debbugs.gnu.org; 27 Jan 2024 16:25:15 +0000 Received: from localhost ([127.0.0.1]:55783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTlUY-0005Gm-Lt for submit@debbugs.gnu.org; Sat, 27 Jan 2024 11:25:15 -0500 Received: from lists.gnu.org ([2001:470:142::17]:59582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTlUV-0005GU-7Z for submit@debbugs.gnu.org; Sat, 27 Jan 2024 11:25:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTlUI-0002TT-GY for guix-patches@gnu.org; Sat, 27 Jan 2024 11:24:58 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTlUD-0003DQ-Dm for guix-patches@gnu.org; Sat, 27 Jan 2024 11:24:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706372688; x=1706631888; bh=HlYtC9Gf/q2DNIEdVBrxDEoTv2ZOT5NRsFHCQHmRZPc=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=q9AJz5IJoJdBVXMRQYa+zy3GH/n9OWAOJW4/ATY+G4L0tZvDRYfxGSDD7on7LgrOe Y58E+/yYZ5W1ga6KbIjE1g97nnswX8/9ET1CxfeL/kM7oFbMSzXfLoBUTH2AHZEMFi QIfRvKr4ty25toDArMpac9lcZ2gHNv5EY94OQZyGAl5JymSXOSYi2KguXd1YGw0bFy 65qNe2Kv/9wcfA5JjRfVHvmidVv6s9CdtOKlTeGKEFGahaSOcr4P//01t8DzdxCecE YLxiaAhjH2oaWpR5SBG7sOtokPUi4o04LRolRDPi2kgVHnfvjlS748FIXC3SjHMvMd OD0lrW1+H2FIw== Date: Sat, 27 Jan 2024 16:24:35 +0000 To: Suhail via Guix-patches via From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87wmru922o.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.22; envelope-from=suhail@bayesians.ca; helo=mail-4022.proton.ch X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, INVALID_MSGID=0.568, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Suhail via Guix-patches via writes: > I believe there are two issues (not including the spurious entry in > native-comp-eln-load-path which may already have been resolved in v7 of > the series). All my observations below are based on v6 [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: submit Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Liliana Marie Prikler , Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Suhail via Guix-patches via writes: > I believe there are two issues (not including the spurious entry in > native-comp-eln-load-path which may already have been resolved in v7 of > the series). All my observations below are based on v6 [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Suhail via Guix-patches via writes: > I believe there are two issues (not including the spurious entry in > native-comp-eln-load-path which may already have been resolved in v7 of > the series). All my observations below are based on v6 patch series. I can confirm that the v7 series fixes the spurious entry in native-comp-eln-load-path. However, the 2 issues pointed out in the previous email remain: 1. failure to load natively-compiled version of non-builtin libraries like emacs-htmlize possibly due to symlinks, and 2. failure to load natively-compiled version of some builtin libraries like uniquify due to incorrect naming of .eln files --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 11:50:26 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 16:50:26 +0000 Received: from localhost ([127.0.0.1]:55798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTlsv-00062m-Ni for submit@debbugs.gnu.org; Sat, 27 Jan 2024 11:50:26 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:42045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTlsq-00062T-2p for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 11:50:24 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-a313b51cf1fso240094466b.0 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 08:50:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706374207; x=1706979007; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=hbkL6BElQaUxL4nkR27/SdHkmBUwfiLYbZFwQ7ucR6E=; b=cm05zSr4JwsfN357yMeKibcnTv8vKpy4IftPVe5D/ZOsdUPn4XEFgvSlXU2DZKjwn+ k5XUhE4ZtF+xX1/MqPtf0XFJBP9JpkGKIgV0itQxgUErUkNt24/s3vFpJsoqgy9i0Mz/ 4ExE3MIIFwpHnl3vAQH39yKsxKlQJlGARgboXFxYuKbUkrA00sGYpXnf8j6vvJpXHAwx dBvyjtg2rrYctu2tgIPku7oGj+USMlpe+hhGxBYhm+VJlslvyb8nNPsMfX6QuTVmw28T Os37j1I9dLgEx1frN3jYKkQD6N1o22nExLWxoSvxOzyZ6fFT89G02QBCrRt5zcLsX9x/ 62EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706374207; x=1706979007; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=hbkL6BElQaUxL4nkR27/SdHkmBUwfiLYbZFwQ7ucR6E=; b=b+xR/zV+i3cRbcpaAuWpLPL+eCRXptqIWB2d4v1xPYquhQRxRejxrT05UtkHOn4RaQ GTQtAOBcDR9TN5myfAdPqv+uK1DRGpxYBRMQGee7Esv1JWt2tLeesYF1I7V12h15xQ4q Fx4zwRA/02qb89VqGO5rx1PolfEmVOtNWSWnKdSnx5anFACR6nfgDrtPp1GswiHrFhO8 x6NLYWSjQnOBAsYrUjyb4suc/a/VeYKPOjyWR6WGv9Qacnc66hBf6vVBj+jEPlcijD3K bYTc9HAt1Tp9IEtJDT3bP2Ug03/YmZygkWkCjVrlVOtKJinY9eOUPNxLSp/fuGa2IQ0E ZlmQ== X-Gm-Message-State: AOJu0YwYnPQsS8iVnSi1OV1zqWRlkKUoZHEs12u9kS6rZTjsfgEU0HCZ hzbEe6geV9m/nODU7svsq9+V9reLHEnpvqmWESMVOczaspSUkgvg X-Google-Smtp-Source: AGHT+IG9F63VR1Uv2JL2DJ1GNO46XXm2y/Gc3arJ11VSRCbf+EVs7ia4Znec1TLR+snVDEyTu3CfTA== X-Received: by 2002:a17:907:9872:b0:a2f:6053:2ab7 with SMTP id ko18-20020a170907987200b00a2f60532ab7mr3580387ejc.11.1706374206692; Sat, 27 Jan 2024 08:50:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n11-20020a1709061d0b00b00a31805b4165sm1929790ejh.11.2024.01.27.08.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 08:50:06 -0800 (PST) Message-ID: <070e018eb1d848cf296791672ffa6499995ffef3.camel@gmail.com> Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. From: Liliana Marie Prikler To: Suhail Date: Sat, 27 Jan 2024 17:50:02 +0100 In-Reply-To: <65b522ef.050a0220.6e48b.a677SMTPIN_ADDED_BROKEN@mx.google.com> References: <65b522ef.050a0220.6e48b.a677SMTPIN_ADDED_BROKEN@mx.google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 27.01.2024 um 15:36 +0000 schrieb Suhail: > Liliana Marie Prikler writes: > [=E2=80=A6] > For emacs-htmlize, I believe the issue may stem from the fact that > some .eln files are available from entries in native-comp-eln-load- > path only via symlinks and the .eln loader may not be able to load > symlinks. =C2=A0 Would you care to debug this a bit more and report your findings? > Packages such as ox-html are available from two locations in the > native-comp-eln-load-path.=C2=A0 In one location they are symlinked, but > (presumably because org is a builtin package) it is also available > from another location in the native-comp-eln-load-path and in the > latter location it's not symlinked in.=C2=A0 I believe this difference is > why for some packages natively-compiled versions are loaded (e.g. > org, ox-html, etc) whereas for others it's not the case. Well, as pointed out in the deleted code, dlopen has a "one shared library per file name" limitation. I don't think we're hit by that thanks to unique hashes in the store directory, but I might be wrong about that. Maybe we have to do java-style FQDNs instead. > In addition, I believe there's another issue.=C2=A0 Some packages' names > are getting=C2=A0 truncated.=C2=A0 For instance, instead of uniquify.eln,= I > observe niquify.eln.=C2=A0 In this case, the .eln isn't symlinked > (presumably because it's a builtin), but due to the name being messed > up (perhaps too aggressive a truncation of hashes?) the natively > compiled version is not available: I am not truncating any hashes, I'm not even computing them in the first place. The functions I'm modifying are publicly callable, namely comp-el-to-eln-rel-filename for the relative file names, and comp-el-to-eln-filename for the absolute ones. There could be an off-by-one error hidden in the stripping of the BOGUS_DIRS, however. Let's investigate that. > > uniquify-item-p is a byte-compiled Lisp function in `uniquify.el'. >=20 > The manifest file that was used is below. >=20 > #+begin_src scheme > =C2=A0 (use-modules (guix transformations) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (gnu packages)) >=20 > =C2=A0 (define transform1 > =C2=A0=C2=A0=C2=A0 (options->transformation > =C2=A0=C2=A0=C2=A0=C2=A0 '((with-input . "emacs-minimal=3Demacs") > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (without-tests . "emacs-clojure-mode= ")))) >=20 > =C2=A0 (packages->manifest > =C2=A0=C2=A0=C2=A0 (list (transform1 (specification->package "bash")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 (speci= fication->package "coreutils")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 (speci= fication->package "git")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 (speci= fication->package "make")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 (speci= fication->package "emacs")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 (speci= fication->package "emacs-org")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (speci= fication->package "emacs-org-contrib")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (speci= fication->package "emacs-citeproc-el")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (speci= fication->package "emacs-engrave-faces")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (speci= fication->package "emacs-haskell-mode")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (speci= fication->package "emacs-htmlize")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (speci= fication->package "emacs-markdown-mode")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (speci= fication->package > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 "emacs-org-pandoc-import")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (transform1 (speci= fication->package "pandoc")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 )) > #+end_src Note, that you can map transform1, saving some typing overhead, and since you are transforming all of your packages you could compose that with specification->package. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 12:16:27 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 17:16:27 +0000 Received: from localhost ([127.0.0.1]:55811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTmI6-0006k8-Mc for submit@debbugs.gnu.org; Sat, 27 Jan 2024 12:16:27 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:39597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTmI1-0006jo-VV for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 12:16:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706375768; x=1706634968; bh=t9PHz2WEoH9SqKfmHshSXZwgIbrxkC6qX2+MvEDbOeA=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=PMv1vNHO7OU6TJkPY+kU17j5PJrJcXRhDRLg3m6VUsG6sZxcTHIcXIMyLDH5I/6YK efr77zml6NoAHX+Drkjgnu+9CqKJzh/R91jSSIMCXooqPyyyxf6smX9jFvMoL2vyqq sc9gm8i/vDgL2VahZdKlNFihPBGs99vt3g+4gAbBFKLv/avaR9DjYHEPqS22XF9JDp GE+YkRQPq0+2vePn6KgVmP3u4K5ueraCN32z3ATVx6rhFyDuXuflKsGr00fmXqLNBX /nd7CtSHsIw9VfgDJHFuuKZQjqeaIvouoXv+1vTC41fIn7mr2sfcUjMbBQOYI+t6bx p+gcuij/fUboQ== Date: Sat, 27 Jan 2024 17:15:49 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87sf2i8zpa.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Liliana Marie Prikler writes: > Would you care to debug this a bit more and report your findings? The locations in question are in the store and hence write-protected. What's a "safe" way to debug this? Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Liliana Marie Prikler writes: > Would you care to debug this a bit more and report your findings? The locations in question are in the store and hence write-protected. What's a "safe" way to debug this? >> Packages such as ox-html are available from two locations in the >> native-comp-eln-load-path.=C2=A0 In one location they are symlinked, but >> (presumably because org is a builtin package) it is also available >> from another location in the native-comp-eln-load-path and in the >> latter location it's not symlinked in.=C2=A0 I believe this difference i= s >> why for some packages natively-compiled versions are loaded (e.g. >> org, ox-html, etc) whereas for others it's not the case. > Well, as pointed out in the deleted code, dlopen has a "one shared > library per file name" limitation. I don't think we're hit by that > thanks to unique hashes in the store directory, but I might be wrong > about that. Maybe we have to do java-style FQDNs instead. Perhaps. I'd wondered, more simply, if symlinked .eln files were ever being loaded. In the limited testing I did, I didn't find such an instance. For what it's worth, only one of the entries in native-comp-eln-load-path seems to have symlinked entries (namely, ~/.guix-profile/lib/emacs/native-site-lisp). >> In addition, I believe there's another issue.=C2=A0 Some packages' names >> are getting=C2=A0 truncated.=C2=A0 For instance, instead of uniquify.eln= , I >> observe niquify.eln.=C2=A0 In this case, the .eln isn't symlinked >> (presumably because it's a builtin), but due to the name being messed >> up (perhaps too aggressive a truncation of hashes?) the natively >> compiled version is not available: > I am not truncating any hashes, I'm not even computing them in the > first place. The functions I'm modifying are publicly callable, namely > comp-el-to-eln-rel-filename for the relative file names, and > comp-el-to-eln-filename for the absolute ones. > > There could be an off-by-one error hidden in the stripping of the > BOGUS_DIRS, however. Let's investigate that. Were you thinking out loud, or are there specific steps you'd like me to help with? > Note, that you can map transform1, saving some typing overhead, and > since you are transforming all of your packages you could compose that > with specification->package. Appreciate the tips, but I should clarify that the manifest file in question was generated by way of guix shell --export-manifest. I'd omitted the header. --=20 Suhail This email is not an offer capable of acceptance, does not evidence an intention to enter into an agreement, has no operative effect until a definitive agreement is signed in writing by both parties, and that no party should act in reliance on the email or any representations of the sender until a definitive agreement is signed in writing by both parties. From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 12:54:49 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 17:54:50 +0000 Received: from localhost ([127.0.0.1]:55856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTmtF-0007wT-CK for submit@debbugs.gnu.org; Sat, 27 Jan 2024 12:54:49 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:60457) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTmt9-0007wA-I9 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 12:54:48 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a2f22bfb4e6so242417566b.0 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 09:54:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706378070; x=1706982870; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=ea9XebGK1+bT13CcJlDzDG5mh2fWzfN4bO4ku6MnYU8=; b=bW6+H0mA8qnXr2hQ5OIWCWMdds3TQpm9Z8lPtitz1qRqT+RS72rkfgeDNxjb+sruXP 0LnkSbcQ/zmjdPx1VOdeyJpKhbV+am9gk/JuorK32uAE2Wtc/R1dvKgfmwwP725uMio+ /7ng2aO8YADCiKtnG9k6wq+L3iK0qa/9TFgZGXxUyM6TkwfnWLGJGXWb8qB8/7m9mhu2 9Ko2Smx0EcLjR+E/Fj+ESL6+2qLGSqJDyVO8svW0q3MnRQek5J0AdaDE/pgQ7VppFtnn cU7ikcXon8M5XZ2YvkQNFcIdAgMnDxAzFfNnT6KjM2tu+C7Yrh07GOkIG2RNrKYgo/3P LODA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706378070; x=1706982870; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ea9XebGK1+bT13CcJlDzDG5mh2fWzfN4bO4ku6MnYU8=; b=tJ+Ql7vwiXxSMJnE1Dae8uuCYPdNJtvw8csRwbL1Cu+o5rF+rg/zx4hrtDCKbMb4jn uQDF+/GQo2/Cl2+BGO6YFaa4aWg5A2VuUDZSFLj1IJt4TR+Tgv/pIFS2otF4Uhnzhexo yJ6EzebAmAWwniUNXkWt4KidbUnIC30IR8fxSnc+xPGYiOZoUlutbhhgEmeQ1dBW1RdJ N8lrfF2HAAXPo+vnlGjDzMfBYSpdcs2Z6jF6I/y5luykKE5wj1/1kpP+JJHOYNzDEWki gpWowbPfKK+yojVa3kHFOi3F+lPt0jtEynwiK2l76nmf1x3/xzKx2Tuf8ijxUUkQRur6 IreQ== X-Gm-Message-State: AOJu0YxMVDFW06/+cfW8YjnBT4Enyrifzy/TyNUAzvoCEg2RweK3LwKr FgSFI7IAACEnY0wI/TTELyoknSssrb0hJqih2QHNN4dTEWKoaoCQ X-Google-Smtp-Source: AGHT+IE0ZZkFhOfoAOODhmpDuzuFGYKfbtnN80QY8QKhCVvkipYeAItMFBuotasZoezxiY3u8hqaiw== X-Received: by 2002:a17:906:d8f:b0:a2a:c2b7:ee92 with SMTP id m15-20020a1709060d8f00b00a2ac2b7ee92mr1697795eji.50.1706378070256; Sat, 27 Jan 2024 09:54:30 -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 st1-20020a170907c08100b00a2a61b9c166sm1945211ejc.33.2024.01.27.09.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 09:54:29 -0800 (PST) Message-ID: <0c562727fbdf32273bb372c677e4fa68652cf709.camel@gmail.com> Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. From: Liliana Marie Prikler To: Suhail Date: Sat, 27 Jan 2024 18:54:26 +0100 In-Reply-To: <65b53a59.df0a0220.d6f27.b59bSMTPIN_ADDED_BROKEN@mx.google.com> References: <65b53a59.df0a0220.d6f27.b59bSMTPIN_ADDED_BROKEN@mx.google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 27.01.2024 um 17:15 +0000 schrieb Suhail: > Liliana Marie Prikler writes: >=20 > > Would you care to debug this a bit more and report your findings? >=20 > The locations in question are in the store and hence write-protected. > What's a "safe" way to debug this? >=20 > > > Packages such as ox-html are available from two locations in the > > > native-comp-eln-load-path.=C2=A0 In one location they are symlinked, > > > but (presumably because org is a builtin package) it is also > > > available from another location in the native-comp-eln-load-path > > > and in the latter location it's not symlinked in.=C2=A0 I believe thi= s > > > difference is why for some packages natively-compiled versions > > > are loaded (e.g. org, ox-html, etc) whereas for others it's not > > > the case. > > Well, as pointed out in the deleted code, dlopen has a "one shared > > library per file name" limitation.=C2=A0 I don't think we're hit by tha= t > > thanks to unique hashes in the store directory, but I might be > > wrong about that.=C2=A0 Maybe we have to do java-style FQDNs instead. >=20 > Perhaps.=C2=A0 I'd wondered, more simply, if symlinked .eln files were > ever being loaded.=C2=A0 In the limited testing I did, I didn't find such > an instance.=C2=A0 For what it's worth, only one of the entries in > native-comp-eln-load-path seems to have symlinked entries (namely, > ~/.guix-profile/lib/emacs/native-site-lisp). You could try stepping through loading a natively-compiled, but symlinked library, either with the emacs debugger or gdb. I sadly don't have more hints to give; you probably know more about this bug than I do. Alternatively, you could try union-building emacs + your libraries and resolving those symlinks as you do. This should give us a clear hint that it's the symlinks and not something else that goes wrong. In addition, you might want to verify that comp-el-to-*-filename matches the files you want to load. We could try resolving symlinks in there with realpath as well. > > > In addition, I believe there's another issue.=C2=A0 Some packages' > > > names are getting=C2=A0 truncated.=C2=A0 For instance, instead of > > > uniquify.eln, I observe niquify.eln.=C2=A0 In this case, the .eln > > > isn't symlinked (presumably because it's a builtin), but due to > > > the name being messed up (perhaps too aggressive a truncation of > > > hashes?) the natively compiled version is not available: > > I am not truncating any hashes, I'm not even computing them in the > > first place.=C2=A0 The functions I'm modifying are publicly callable, > > namely comp-el-to-eln-rel-filename for the relative file names, and > > comp-el-to-eln-filename for the absolute ones. > >=20 > > There could be an off-by-one error hidden in the stripping of the > > BOGUS_DIRS, however.=C2=A0 Let's investigate that. >=20 > Were you thinking out loud, or are there specific steps you'd like me > to help with? That last sentence is me thinking loud for a solution that I'll try for v8. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 14:40:32 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 19:40:32 +0000 Received: from localhost ([127.0.0.1]:55984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rToXX-0002zp-OQ for submit@debbugs.gnu.org; Sat, 27 Jan 2024 14:40:31 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:25267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rToXR-0002zW-Nk for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 14:40:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706384411; x=1706643611; bh=jRDj0R3nOp6UPi/4J7uxM07Hxb/byAgdUvWOmqMTvzQ=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=KKWTNZzGRQdBH0nuZ0UAUyWn4Ik9FZUWq/olbtikIk3KjIDg+KBaYa2ckUnnpDU9J 6hQ4pR1bjbLwCFXcVfFg8xW/HSRi+jlS0CwF9GSkKI/mskPNPS4JC3bOVb7rCNGNua hLYS6zc7ScJJRIZc5bLNgggNkCYM3LioaJpNQUczoWNu4CkNJHxFaDIMJqniBx0VRp 1V5EnX6X47ZMnwVh2MoRctSIbQ0snr108+KijjGQCzJNs8vPChHHqkHLhyrQGMltTx mdmJ2Oux3rVEAWzLVPMvhAepWcxZZKn2g78rPfKjtlIrwXLygwTp59gvg8UkgDcZId 2d3jlwE6DSbIw== Date: Sat, 27 Jan 2024 19:39:41 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87wmrumupy.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Suhail via Guix-patches via writes: > However, the 2 issues pointed out in the previous email remain: Correction, there's only 1 issue. The first issue was a false positive. Apologies for the noise. Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Suhail via Guix-patches via writes: > However, the 2 issues pointed out in the previous email remain: Correction, there's only 1 issue. The first issue was a false positive. Apologies for the noise. > 1. failure to load natively-compiled version of non-builtin libraries > like emacs-htmlize possibly due to symlinks, and This was a false positive. Turns out, if the function in question is only autoloaded describe-function won't correctly identify the function as being natively-compiled. This is consistent with what happens on Emacs 29.1 on a non-Guix system. Not an issue. > 2. failure to load natively-compiled version of some builtin libraries > like uniquify due to incorrect naming of .eln files This issue remains as of v7 of the patch series. --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 15:11:25 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:11:26 +0000 Received: from localhost ([127.0.0.1]:55988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTp1R-0003qG-Jp for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:11:25 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:57580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTp1O-0003pt-7b for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:11:24 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-a3542a3374bso73071066b.2 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706386268; x=1706991068; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=BiUz5K3b5zTPwGm0exXX/BOE4nWYRGWt2bVFy9hkVgs=; b=H/68lHqk/QT9mA56vKWmcYN7wA8nsbUjJA8F1Rl8Y05PW6GnkhrswFqz+i48xBadFl 4bJWTDz4A0uA266UWGvBPgmWGk6JaSLQSa8sxMYfRofihgaErkEqQApLpfJjgdzwhhVZ fZOJ7kK+MCtj/j2l40iq0cczn23LdIHo48lOq17P6pTUwgVy0MEZQ8tktu0j1YUjODB6 LClroxiB962iV6uPYX4MKeRJJDGSz2MutjQxbzexeyC+tgHMJmzYMN8MlRKKcVij7SIb Oy5i3lZmM9JcN1F99YTeXPC/HWs1a8vDx6WOwUctwKc7CrB/qWmdnlUlHCHEaucReQO9 aNJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706386268; x=1706991068; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=BiUz5K3b5zTPwGm0exXX/BOE4nWYRGWt2bVFy9hkVgs=; b=k/+ABSaECZIh2rTG4wvv2aiFsSS/gpgjGM2vfVyInX6OETJa0P2yVZuwEGmTcQatEH PVYeb5iq6URIb9LK8gTTF5gqYSPhIrxknGVhLyJ58gKqgnYABkrYhVYjz/18Nzn+wlvH UmlXEKr7JJeVtqk3ePtx2hwTuLWnJq42wikNVM+2cXUHNKu4AkZwLHHcfGI0EyRviTtj CChNJj2CgG9xH6bXqcYL7+iqMjUnT7svMwb5fjgHizQw73eI4aamuHHe3j+SQNNG50hU EM6O7n5qa2tYSV7C4La+pogfRdOhTYa3J0zl/7SA5RlKrWCJKk63qBrY3R5q0xMUzgoE vQTA== X-Gm-Message-State: AOJu0YyWA3zF/yakVNOziVmYchpC54Dd2zKZF7JUF34P1Ofby5tBtjNL wUcbHak6uhfvFf7NY/iSQc480ljauBwAaK8IgffVVRAf7iO5+rKb X-Google-Smtp-Source: AGHT+IFT5Akforv+h0r2yZSx8lVa/3fs3bgZ6hmBjX1Bg1e8jl7k3jUkAZWsirBVXqlBc3xSYARwww== X-Received: by 2002:a17:906:b49:b0:a34:a067:7ae3 with SMTP id v9-20020a1709060b4900b00a34a0677ae3mr1444359ejg.31.1706386268339; Sat, 27 Jan 2024 12:11:08 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g13-20020a1709063b0d00b00a34ace86850sm2061714ejf.207.2024.01.27.12.11.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:11:07 -0800 (PST) Message-ID: Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. From: Liliana Marie Prikler To: Suhail Date: Sat, 27 Jan 2024 21:11:04 +0100 In-Reply-To: <65b55c1c.050a0220.a79c1.cfa9SMTPIN_ADDED_BROKEN@mx.google.com> References: <65b55c1c.050a0220.a79c1.cfa9SMTPIN_ADDED_BROKEN@mx.google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 27.01.2024 um 19:39 +0000 schrieb Suhail: > Suhail via Guix-patches via writes: >=20 > > However, the 2 issues pointed out in the previous email remain: >=20 > Correction, there's only 1 issue.=C2=A0 The first issue was a false > positive. Apologies for the noise. >=20 > > 1. failure to load natively-compiled version of non-builtin > > libraries like emacs-htmlize possibly due to symlinks, and >=20 > This was a false positive.=C2=A0 Turns out, if the function in question i= s > only autoloaded describe-function won't correctly identify the > function as being natively-compiled.=C2=A0 This is consistent with what > happens on Emacs 29.1 on a non-Guix system.=C2=A0 Not an issue. Interesting, but probably not avoidable. There's only so much information you can put into autoloads. > > 2. failure to load natively-compiled version of some builtin > > libraries like uniquify due to incorrect naming of .eln files >=20 > This issue remains as of v7 of the patch series. I fixed this one locally, but =E2=80=98uniquify=E2=80=99 remains byte-compi= led for no explainable reason. Will send v8 soon. Cheer From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 15:58:20 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:20 +0000 Received: from localhost ([127.0.0.1]:56032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkp-00053s-Dj for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:51498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkn-00053T-6o for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:18 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a28fb463a28so148639266b.3 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389084; x=1706993884; 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=Et0ctxEctfCt65YT2Kig42OVBkXjfkMhxb9W0miLoK6e3AwM0czH6De1adgsvSHLp1 n8cLBbBXiF1NSMkEnD/gdNNwxYe6xf+ZVozqDclJC3jruhBDyFzlcoEr7o6BW635w4s7 it6LKXZ5MTu2U3ZGU+vl8h3yhWI2+DoK10gNSVrrm6v6JoCafxPmzACqlTXWBnpx6ZNw lMUzVBKJ2CSjpfkgiMhiGwqj6tLu81S+vkDQluPM6fYe1BYvM111nA/eC+VK9OUsDTFF UgPiBsDPDHcyVf7zZaavnuYXzKmsX1+6beLi0a9Zy7WBNDtHAjAeoN7XtJMc49wr749v vBCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389084; x=1706993884; 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=j5Kdxs8UY3kFs/YofwycJ4fHEyu9K/Qh+7EN4iEjqQUR2eT1LrTC/Al1Ah4lWLp/aT b5Ds0/QbGV0ciwMga8fRHxtxKE3swD4fIdei2Sspub3SHUtQrgvLRC5xXkJzs2RIK1+A u3Oq8qOJwCVfrfXoHx36zIHJbKpuquYXYSvDy+DRuTRpZig4z2ofp6HgaXJDot3MDVWB F/jdJ6wy2NzXUE14euRYp8cRd3VOiCq4ZQ0rXQSY48ds6lz7UpCeL9kVXhQQlXBX7Zbz imksoRtbr3sJIqR7vMc3Sf1fKbL/EzNI/oBy5dNluAzRCrg3+edHunJwzoMo4NxMHKRj lSaA== X-Gm-Message-State: AOJu0YwwuEHuiA7qrjuxti8VPtLQb/u/bFf9OQ0JWRZUbmnLEWp9v0hB tCTyyRlGicYW4Q9d2IA08gPYNsugkR5AaBJs1HHd0wqqQ83d3UEVHCzAk/HxwXY= X-Google-Smtp-Source: AGHT+IF2ti8yIK9B8GWJpo7+5eZ009Xt8pvjbPfRmii7AhBLaAZhzPnTtpeoAK1NiE1CxrI9BcGAcQ== X-Received: by 2002:a17:906:37d4:b0:a34:e8ed:1000 with SMTP id o20-20020a17090637d400b00a34e8ed1000mr1539143ejc.9.1706389083658; Sat, 27 Jan 2024 12:58:03 -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 q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:03 -0800 (PST) Message-ID: <75fc54d6051c02ab2edc333de71ee4689a287ed0.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:41 +0100 Subject: [PATCH v8 2/7] gnu: emacs: Build trampolines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 15:58:20 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:20 +0000 Received: from localhost ([127.0.0.1]:56035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkq-00054C-6F for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:49226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkm-00053S-9c for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-a357cba4a32so8680466b.2 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389083; x=1706993883; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=BKKTxx1prubQn/yNOr+OP+t3On58djdG/frDz6VOdQn+dNkFFb/EANKhjB+4xVDlme epgOq4rRz1kEkLtVJakGLNdWYwqrX7UF51VP/NdhCoQTb8NnNEWFncJCMlbIDcHG67nU mMvC1AXyfob+Jul4cUS4Lb4LW5nCSGdQoSTwLlYMI3YQkUZ4GqepChrvKHlWqiO++uFm PmB+WJpfm39h12sjxGSIKVikRFYQVwvV67o5mVFDGkmjH3uuxYGKHNT7hWIfZNU0B9DQ hvLLmWYi8r4EsOowAGuCs6FR3yrtLIOykNOHQ2PmiC1tF8rtM/GkBU31e7gyyID/tGZN 8ZSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389083; x=1706993883; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=cu59ZHNDKcUv3w3nMqhk+adxmCFwh22pe3NB4sFTjXg7Y+4mScr7PV9D8nb9X3/MBV UI8iYvcLTb2Nf900xmwD6D/GFsKSGCcnmGh49B8ooOwScmcDZVdAxSb0Uzvl7rnAEtgn bUCL4unMbXMBkD0Yn/H+0sKGk3X0KJDzW3MHYzc1ttPPWXlJ5dPdO2/xmysY1qaC7Aen ggxJDo8MiC2vNtY9LgRRSi+WHvyDXbYYoQ/XlFPGn9ERYWPaWi8uMWcPBnKtGp+h7oU6 jyXXa7kQ3SodFAd5lsLMvVR/3DFxv/vnwY6+qGXZIHlGHxi2SyU4AC7whbe8mLH9cdIg EYaw== X-Gm-Message-State: AOJu0YyNqb++e0+aGSAE+FnUUkHecA0iIi+OJkYUliCFFHlwanP9zv1I Dzr9vGqT1Gpbp/z2rdQxCy8jaB9R3xEkg6aXyecQezoTYo6ZZKjC3bl7ENnm6kQ= X-Google-Smtp-Source: AGHT+IHS9lugUGglP+TYAa0re4Zq2kxMhXpiXWA+EOspkb7DFzx7lt4SFiy5/usAX6EpuyUzI5TKBg== X-Received: by 2002:a17:906:a04e:b0:a34:d1a9:77ad with SMTP id bg14-20020a170906a04e00b00a34d1a977admr1601315ejb.22.1706389082980; Sat, 27 Jan 2024 12:58:02 -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 q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:02 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Mon, 22 Jan 2024 21:21:26 +0100 Subject: [PATCH v8 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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-min [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:641 listed in] [list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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-min [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:641 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 15:58:31 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:31 +0000 Received: from localhost ([127.0.0.1]:56038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl0-00054i-O6 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:31 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:59578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpko-00053Y-N2 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a33735d22fcso92473666b.2 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389086; x=1706993886; 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=K0bUKGc+W27nLKazJE9wfpZIjodQX+HWsYID+X04zIwMKnlsMfrscrozSIeqnqSKNS +KvVuVB6mllBoTUa7g46uIDRMIY76QLxtlwwDwQ6z5rSdt1t5LN+wN4nD75u5o49xky8 BsO1EvCj/eCAzUfcbsJjbIAQAuOtxYB8l5kEItqY1wNsqE9tkFE4YzyGclx5hRXM31x4 KGgDprnYNtOpNqvX5DgnOEVTdYEJkBMn65CJsltKedSb1yh4jtinvytPJddfN9YxcGqf hZEi1YecVxc4wcY8pbI5XeKH5vXKiO2rFrb6/yzuMQBOM2sInR3vmOW66h/2tJcgUQc3 TkPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389086; x=1706993886; 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=Suw7jX+AFuTUV9tqTXSKpXmQvr+sFSoWPSM/tigKipImlFiuH1zrNoZFvQVGzmut2j UhdU5TuJcTwkS+rLmhJmr5mOko0XD9EWbOYYjOhLlxdiAi9UdslsYwmg2k8+yxy768Hv BeAxPu75YT3h88iMvIacgBeCIK0ra0e+twhPJI1oZ61e0JURrGjifFWRmO7grtbNUCib RkqmGetODsiTTa+X/XMIG5kgOPWsi/Vn4WPBEDdzLdWbhkD/cr4DWx8YdeNVoKp3n+ld cu1WyFuP9oCvnqZC+YHb1is4BLVsRuh4aSd6N3rmhvJed4EBIS51t1EIWBZiWtY+8kD5 d/XA== X-Gm-Message-State: AOJu0Yw3M/kSi2FpCfDgBSlgelOt3C6GBxhGrzwDMGHfhE5zsO9SSeCJ q16NMRlArICMIHLjmrrk35aNzLD7SLKMfnkAtqVdZgP4zXeY9ZM+eIj8wxDWYqA= X-Google-Smtp-Source: AGHT+IE2gHBkKjidK3P1/tAoocRskFHlAo1T24EaFHq/X9UGpZextdbyP3XxsrVKA8M3kQo7Ne/IKQ== X-Received: by 2002:a17:906:34d7:b0:a31:6c5e:eb96 with SMTP id h23-20020a17090634d700b00a316c5eeb96mr1432982ejb.58.1706389085811; Sat, 27 Jan 2024 12:58:05 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:05 -0800 (PST) Message-ID: <45656b35960c59a586547bca0b9c80491a77a027.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v8 5/7] build-system: emacs: Compute relative file names. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 15:58:32 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:32 +0000 Received: from localhost ([127.0.0.1]:56040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl1-00054k-4D for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:32 -0500 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:52634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpko-00053X-Gp for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-5100409e31eso1997354e87.1 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389085; x=1706993885; 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=T9WgV3yEn+7iYq7JNRJetMek5jTB7fFb8Bj6IqZws6jxMoiyjYVyxFT93tsMYuUazg H3TJf0drbTQiHGJqtpAxCwtTfuivmlNxFmN2+Oy5p5JUslHGAC2W8sr7hBNOZCCUaIB0 4980z+sm8GvD3bzB8lhGFMsgMb0vjFKAEtoyILi9fK51wo2YI/UqrmW54nB32cyZPwWc Ke6mB25r0Ufz0N8TJfWLjHzz6ewb1vpJET9d7Kc5Yjpr1Boo4o7OV8MNr/khBT/871Pt 69iXcVJXDysJjCwIP+CMppU8HSuboqdQWfVqjqYMlbGOaegkx9v+WBHuMmbufTyFiEKk IQBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389085; x=1706993885; 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=LLtX8HF1NjobfaPqMwRuF29PayJlq3gyT7DnLcM+uVChQ+mcGOcmrugbhCOPsex+5z 4xqe7lMNZ+d4NOxx9F2/XhJBs5I1uKZJX77dDbhrCC9ZsFcH4Ujlu2WBk+TYQm2hqTp+ c5N9OxXckDe35KWVybMoSUHW2XneWKgQGWgb1T0CZm7+5Cj7OjhZMw0ItmKCxDYsMWdq eJbYZH27+QNMaVdYeucAKiDr3j1AIm5qEEKK4qWr743y5rt1HezOnBMhYRsYTFEXJEUt EM4s/K5fJYjwYtR7ZZihmUQMRzZc14uN+855PsYYGHKF/I0hQA9kWpOdVKlZdgIV+2sI 939Q== X-Gm-Message-State: AOJu0Yz0CmnQ9RCkA6CeXBHupoMNn28rto+dqstvWPZ9DRpASvfppQYx ofoUF8XiB0mRLvrDV4W5iCd7t844YxBvJYAihObHcIc3a/n8nQwZ5nxfxCRQ X-Google-Smtp-Source: AGHT+IEgFVDgsmH1E/SGzpQo4t+B97UsLyuTZsn2JhOmqV9MYPUEsh/I9MF98OoOO8VeM5cjtCqTVg== X-Received: by 2002:a19:ac0d:0:b0:510:e05:4361 with SMTP id g13-20020a19ac0d000000b005100e054361mr1295721lfc.3.1706389085106; Sat, 27 Jan 2024 12:58:05 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:04 -0800 (PST) Message-ID: <2a1785ea1709b6bca18fb5c92a506cb373757186.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 15:09:47 +0100 Subject: [PATCH v8 4/7] gnu: emacs: Disable jit compilation. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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. [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:133 listed in] [list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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. [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:133 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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"); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 15:58:33 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:33 +0000 Received: from localhost ([127.0.0.1]:56042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl2-00054t-3A for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:32 -0500 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]:60448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpko-00053V-0A for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-510f37d673aso258502e87.0 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389085; x=1706993885; 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=asbTURC9H2MLQ5TCyJCEXLGJFlcs8+liwrpQdjTGKmk=; b=TZLMnuOg2h9GCB9hfupNszgrYHBJw4jvK9OdBmXd/fAXJ/ze/+alQOc3Wof/esi0gl M1ON6BgP8odqu5sw7nLa99bai21+tJ+w+uaPi7GQ3h3rslX7Ac2NyxD+TdzDla1eZde9 rK3njV+7Nx5yIhKbOSKpwW8L66Hld5F8zEdP5qw8GcOUyWASjRoH6z40QeJo6h2amroy 6CIHs2vD+Rb2XycLUGVtJUCBxbl9vRMu83IBeX4WqW88ubb2rRHQvgKXzvziYCTSylZV DTCLo7dy6AP0W0r6jSTuo7H5ko9UwJiTaB89VqyeYJA52nuSYpguTMeUVhcaBt/eNvC1 BX5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389085; x=1706993885; 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=asbTURC9H2MLQ5TCyJCEXLGJFlcs8+liwrpQdjTGKmk=; b=bpvrTOvEBa6iyXCOviJE8Lmz+DN+QU82cIPOwQSpg4zGh2O40y4trVKKsfADwi59a8 aloI8gJU+N6XHhyGNSJVrJOWaj1LUNFipsrF+pgpJlsFYqRuTFW59OMwgSZnnyXm372n jxSjWefjKyn2JC5wfmPDGgFmNXBn5R2Ojx0S4bmWwh04CWe4nMqzzTeKGQf8IZ2K0vgL wcRKNDpbpjTMRrBtTVABL7lDyN+9FneNHl1P5RbDmZHQn999+dRRcuUHL4qx/9UvGO0r Ia1Vo27XpQwMC5BM35zB8urjhDOlOe+jVHluvblrEoN3nBQ5ksF5YNONSpIRo6/9kj70 SS7Q== X-Gm-Message-State: AOJu0YzNDE7UqQu5c3TWxG43kJaDG7UXlEkffQX1MC0pVkcN5jdE4KpN 4KOB1r9jbankGgT/AkTisXYuucJJUDbbfjz4qChVh8DWJCFKx+yWArL+IYgg X-Google-Smtp-Source: AGHT+IECA8Pl9QmXMy07BfYsIuSR/N30XjlNg05DVbcmj3fhxXFKx1JsTINkTw4QhZKgFK77n5kdIQ== X-Received: by 2002:ac2:596c:0:b0:510:c7c:5a6a with SMTP id h12-20020ac2596c000000b005100c7c5a6amr2085385lfp.61.1706389084364; Sat, 27 Jan 2024 12:58:04 -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 q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:04 -0800 (PST) Message-ID: <90158d146ad5fb93c944a67d8a4af204249794df.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v8 3/7] gnu: emacs: Don't hash file names in native compilation. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 292 ++++++++++++++++++ 3 files changed, 294 inserti [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:130 listed in] [list.dnswl.org] 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 | 292 ++++++++++++++++++ 3 files changed, 294 inserti [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:130 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 | 292 ++++++++++++++++++ 3 files changed, 294 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..8e7edfe5c3 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,292 @@ +Upstream hashes both the absolute file name and the content of a file +to derive the name for the natively compiled files. This breaks the +staged install used in guix, as any $GUIX_PROFILE is distinct from +the build directory. It also breaks grafts, as hardcoded store file +names get rewritten; thus changing the file hash. + +In addition, this patch changes how native-comp-eln-load-path is +constructed. Upstream, an entry of the directory “../lisp” is added +supposedly for bootstrap only, but this directory appears to find its +way into the actual variable despite attempts to remove it by calling +‘startup--update-eln-cache’. +The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as +packages may require it, but only pushes the new value now. + +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -4396,26 +4396,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc + Scomp_el_to_eln_rel_filename, 1, 1, 0, + doc: /* Return the relative name of the .eln file for FILENAME. + FILENAME must exist, and if it's a symlink, the target must exist. +-If FILENAME is compressed, it must have the \".gz\" extension, +-and Emacs must have been compiled with zlib; the file will be +-uncompressed on the fly to hash its contents. +-Value includes the original base name, followed by 2 hash values, +-one for the file name and another for its contents, followed by .eln. */) ++FILENAME is resolved relative to `load-path' and only the suffix of ++the first matching path is kept. If FILENAME is not found to be relative ++to any directory `load-path', it is used as-is to construct the return ++value. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); + +- /* Resolve possible symlinks in FILENAME, so that path_hash below +- always compares equal. (Bug#44701). */ +- filename = Fexpand_file_name (filename, Qnil); +- char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL); +- if (file_normalized) +- { +- filename = DECODE_FILE (make_unibyte_string (file_normalized, +- strlen (file_normalized))); +- xfree (file_normalized); +- } ++ Lisp_Object rel_name = filename; + ++ filename = Fexpand_file_name (filename, Qnil); + if (NILP (Ffile_exists_p (filename))) + xsignal1 (Qfile_missing, filename); + +@@ -4423,64 +4414,54 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } + +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; + +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); + +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object directory = Ffile_name_as_directory (XCAR (tail)); ++ Lisp_Object len = Flength (directory); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ directory, make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, len, Qnil); ++ break; ++ } ++ } ++ } + +- if (NILP (loadsearch_re_list)) +- { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); + +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) +- { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); +- break; +- } +- } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4474,7 @@ If BASE-DIR is non-nil, use it as the di + non-absolute BASE-DIR is interpreted as relative to `invocation-directory'. + If BASE-DIR is omitted or nil, look for the first writable directory + in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory +-whose name is given by `comp-native-version-dir'. +-If FILENAME specifies a preloaded file, the directory for the .eln +-file is the \"preloaded/\" subdirectory of the directory determined +-as described above. FILENAME is considered to be a preloaded file if +-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME +-appears in the value of the environment variable LISP_PRELOADED; +-the latter is supposed to be used by the Emacs build procedure. */) ++whose name is given by `comp-native-version-dir'. */) + (Lisp_Object filename, Lisp_Object base_dir) + { + Lisp_Object source_filename = filename; +@@ -4541,19 +4515,7 @@ the latter is supposed to be used by the + + if (!file_name_absolute_p (SSDATA (base_dir))) + base_dir = Fexpand_file_name (base_dir, Vinvocation_directory); +- +- /* In case the file being compiled is found in 'LISP_PRELOADED' or +- `comp-file-preloaded-p' is non-nil target for output the +- 'preloaded' subfolder. */ +- Lisp_Object lisp_preloaded = +- Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); +- if (comp_file_preloaded_p +- || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), +- CALL1I (split-string, lisp_preloaded)))))) +- base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + + return Fexpand_file_name (filename, base_dir); + } +@@ -5859,10 +5821,7 @@ The last directory of this list is assum + the system *.eln files, which are the files produced when building + Emacs. */); + +- /* Temporary value in use for bootstrap. We can't do better as +- `invocation-directory' is still unset, will be fixed up during +- dump reload. */ +- Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); ++ Vnative_comp_eln_load_path = Qnil; + + DEFVAR_LISP ("native-comp-enable-subr-trampolines", + Vnative_comp_enable_subr_trampolines, +Index: emacs-29.2/lisp/startup.el +=================================================================== +--- emacs-29.2.orig/lisp/startup.el ++++ emacs-29.2/lisp/startup.el +@@ -545,9 +545,6 @@ DIRS are relative." + (defvar native-comp-jit-compilation) + (defvar native-comp-enable-subr-trampolines) + +-(defvar startup--original-eln-load-path nil +- "Original value of `native-comp-eln-load-path'.") +- + (defun startup-redirect-eln-cache (cache-directory) + "Redirect the user's eln-cache directory to CACHE-DIRECTORY. + CACHE-DIRECTORY must be a single directory, a string. +@@ -558,22 +555,10 @@ to `user-emacs-directory'. + For best results, call this function in your early-init file, + so that the rest of initialization and package loading uses + the updated value." +- ;; Remove the original eln-cache. +- (setq native-comp-eln-load-path (cdr native-comp-eln-load-path)) +- ;; Add the new eln-cache. + (push (expand-file-name (file-name-as-directory cache-directory) + user-emacs-directory) + native-comp-eln-load-path)) + +-(defun startup--update-eln-cache () +- "Update the user eln-cache directory due to user customizations." +- ;; Don't override user customizations! +- (when (equal native-comp-eln-load-path +- startup--original-eln-load-path) +- (startup-redirect-eln-cache "eln-cache") +- (setq startup--original-eln-load-path +- (copy-sequence native-comp-eln-load-path)))) +- + (defun normal-top-level () + "Emacs calls this function when it first starts up. + It sets `command-line-processed', processes the command-line, +@@ -1362,12 +1347,6 @@ please check its value") + startup-init-directory))) + (setq early-init-file user-init-file) + +- ;; Amend `native-comp-eln-load-path', since the early-init file may +- ;; have altered `user-emacs-directory' and/or changed the eln-cache +- ;; directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + ;; If any package directory exists, initialize the package system. + (and user-init-file + package-enable-at-startup +@@ -1502,12 +1481,6 @@ please check its value") + startup-init-directory)) + t) + +- ;; Amend `native-comp-eln-load-path' again, since the early-init +- ;; file may have altered `user-emacs-directory' and/or changed the +- ;; eln-cache directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + (when (and deactivate-mark transient-mark-mode) + (with-current-buffer (window-buffer) + (deactivate-mark))) +Index: emacs-29.2/src/Makefile.in +=================================================================== +--- emacs-29.2.orig/src/Makefile.in ++++ emacs-29.2/src/Makefile.in +@@ -553,6 +553,7 @@ shortlisp := $(filter-out ${shortlisp_fi + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. +Index: emacs-29.2/Makefile.in +=================================================================== +--- emacs-29.2.orig/Makefile.in ++++ emacs-29.2/Makefile.in +@@ -329,6 +329,7 @@ TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. + unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++export EMACSNATIVELOADPATH = @abs_top_builddir@/native-lisp + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 15:58:33 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:33 +0000 Received: from localhost ([127.0.0.1]:56044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl3-000551-27 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:33 -0500 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:43124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkp-00053a-H6 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-55eb1f9d1f0so1220794a12.0 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389086; x=1706993886; 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=V8GtmNOzQnFb2YmymIpmhqIifghNdN+PcmPTEgAm4lZVpbhpOYyDvdD1zoRx/eCTG7 +iO0GQDFeQGQ7DCAZQJCdctER1rko8W7boiDPJwGbNU/kjK/OZPOqHEwVggj5qtmdSsE LIX7OSYAecSmWSjSAPlKqTAZ+GZOMmf9+ajtWtb4fDEJAD+dKMSrbUcTYgqbyQaPgYqN PXu4FiYeeiI7+M3THZZy2qPAvDO5tP1PF4cjnRtzra9mW8lgKhHI/zKDH39ctGWxOqu2 T0dI7mSXpcgW+6WG6vFaEwbariwJbM9J/93n9VVlM02+VtN3Cdyy8/TSp9d6BC/gZil9 1tbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389086; x=1706993886; 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=TLd7IUUJmYXZpBKOok+4reROn5aKjujV3Bfe6ELjBsnfrbcoC0xMgNC1kL6cIISNYS b+Lu/o4i8w3gOsNmyPnIX36S5tx+6jDVekGS/o0/QArIq2Uhs3hKZZ66rxvWSyWt6gUO CQzwwRQN501K66a9Lk6LwrzCK0Y4j4uH/ViXiRn2lPg1CcSbhWRvRiX0oF7hhjs5OrjX ZekGyIb39XgbOy5CinuCp7aplZ+M69eNLwrdn9M4r6RNtIr91azTKQb2pBzdITRou3e9 MrbHwHAQ0R5TCEM2+N6QR/R9TpDQEK8nPp528yJXLsHyaWDrOFEnXYXGp/giVhNheLOM qxKA== X-Gm-Message-State: AOJu0YzLE54YhXrKNxsT7Hrbzj7Ci07Z+gkfqowl2TktO8PVulAWmZYX UeDIXnTiroaF/pleZCh0y9VLdqeDqgH3x/sE3SH50Hg4VpxQR+2amXPSxGTpBc0= X-Google-Smtp-Source: AGHT+IFGKdbjoy4+dRTYGARjmu8nmQhmhmt54FTS7ibJbAiL0uzWM+cIRrFKpemX0mI2l1r2UqmhOA== X-Received: by 2002:a17:906:ae4a:b0:a31:1820:5758 with SMTP id lf10-20020a170906ae4a00b00a3118205758mr2774672ejb.10.1706389086466; Sat, 27 Jan 2024 12:58:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:06 -0800 (PST) Message-ID: <8aeec12dcad684a53ca8ed955f74e9bd2dc8fb19.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v8 6/7] gnu: emacs-org: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(+) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:541 listed in] [list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(+) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:541 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 15:58:34 2024 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:34 +0000 Received: from localhost ([127.0.0.1]:56046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl3-000558-Cz for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:34 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:57656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkq-00053b-8B for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-40e7065b692so22054115e9.3 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389087; x=1706993887; 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=da9Ald6g1jMgMz31JRjHHKeY4Jn/8i8pWUh7XYJ5EvUnBKeYRoj0FLwoa0vYXtSjPp hP4qNHaF4fRyvvKjNru0hjMHx49JCXZcqWTXj03gR3Lew2FiSx6cCwU5Gtdc/sR+AG7m TT+fEcvlB8vHWvc0//ASRHExYUeswZ1h/JNFbYplrWqY4OVWlUD+LHnrNKe3WEYcd9f1 7C96++IhZPZWpW1AUyxDPl2JDa1ocTMFqT44bMV/ohEY/B6oslW6JDWh7CQZewtIz9b6 LhCvoEhWoUx6dDYfKyTN5dHD5N+69OeNoE5S4X/jvr+t6xEZUCe+CdyBunMnwGIniKKh pkMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389087; x=1706993887; 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=snDaiKx7Y0w57Eess6Ug5uDZrqTjZMM/yB06xkkSLEb8odO2wJ9187HzO7NDncmHB/ 1UTRg6AcMz07Ctw6lyn4Bt09NY/VJ13mPWKVgeC/FMokdqui901F0tzfHviiW9TAfYm+ o5Mkrve5zlpSkvmrqAimuhIhONV60jg8PUeRJ7ak5NDOt8/MQ8OuK3SB77aG6Yheqcke 9iMmitfvp4lbXH+xix7EGc3s+y6kreajquX6Au0somjcrBTaOZloxQ6pGp0Os1GFmY9/ 0yqoGIxHb+gLEIUzSwj37kjMOqdct0HROcNx5582GnRM6vJx63lVCIAs1d1QmFMLdraO hz8w== X-Gm-Message-State: AOJu0Yx1AaG/HmMPfpnQIY1q2OWXPMQhWgTVw0+KQGURi/i0yN5vei2v /Arqwj7dgWHtvrtD+IQ6MAkyuruFf+xM1/yXH3myD041AIQR1F8I1TnGl9zrRb4= X-Google-Smtp-Source: AGHT+IG0Dk4vqlM4cHmFuZkI6efxELewgCIXCgf6gzBDrPBKR97F80M/Og0FhxUtQggD2t2J9eMkag== X-Received: by 2002:adf:ab11:0:b0:336:613e:9e54 with SMTP id q17-20020adfab11000000b00336613e9e54mr1453353wrc.89.1706389087190; Sat, 27 Jan 2024 12:58:07 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:06 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 Subject: [PATCH v8 7/7] gnu: emacs-magit: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 19:13:48 2024 Received: (at 67260) by debbugs.gnu.org; 28 Jan 2024 00:13:48 +0000 Received: from localhost ([127.0.0.1]:56156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTso0-00027A-D5 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 19:13:48 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]:34863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTsnx-00026v-5w for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 19:13:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706400809; x=1706660009; bh=7cExVKwu0EVa7wpLqftn2/RRF6ISmrPVZpc1TUpt8yw=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=VaguV/0zgElhaX6J6Gg2im76An7BMNanPGYdJ/Oru8LMmIqXKWDe9TWqCCofV6Z3E MPDu/cYu4qSgA6S9b+CR4VpQi8VY/0Vjzj06kse0TkU3ErWJifPh3qrEL2g0RTReeY orYIzfKZV+4imiS8yzd+w3mWacB29XtTjc8z9dPwtIl02qSxRg8CIQDK/UaoeX4kdR p21fqO3dzXHWfAw+95O3veGeN/OiuPukyI4GZrcnZ7UfDtNhiXqXWrlynZcmMsVbpT LMj9pNqGACZIUVHydny6fuT7mY5yl9c/5DsbOzPb9TsZwpxDuxYe/vsFM8AAzQhq5x /iF1/70KLAFjw== Date: Sun, 28 Jan 2024 00:13:21 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87ede22u3m.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Liliana Marie Prikler writes: >> > 2. failure to load natively-compiled version of some builtin >> > libraries like uniquify due to incorrect naming of .eln files >> >> This issue remains as of v7 of the patch series. > I fixed th [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.40.18 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Liliana Marie Prikler writes: >> > 2. failure to load natively-compiled version of some builtin >> > libraries like uniquify due to incorrect naming of .eln files >>=20 >> This issue remains as of v7 of the patch series. > I fixed this one locally, I can confirm that the .eln filenames are no longer truncated (as far as I can tell). > but =E2=80=98uniquify=E2=80=99 remains byte-compiled for no explainable r= eason. And too that as of v8 patch, uniquify still isn't natively-compiled. However, if you unload it and then reload it, it becomes natively-compiled. #+begin_src bash emacs --batch --eval "(message \"%s\" (progn (unload-feature 'uniquify) (= require 'uniquify) (take 1 (split-string (substring-no-properties (describe= -function 'uniquify-item-p)) \"\\n\" t))))" #+end_src #+RESULTS: : Type q in help window to delete it : (uniquify-item-p is a native-compiled Lisp function in `uniquify.el'.) I think the issue is because uniquify (along with some others such as prog-mode, backquote etc that I tested) are preloaded in Emacs. I believe that these preloaded packages need to be treated specially. In a non-Guix system, these preloaded packages have their .eln files stored under something like /29.x-/preloaded/ , whereas in the v8 series there is no "preloaded" directory. Instead .eln files for packages such as uniquify, prog-mode, backquote etc. are in various locations: - uniquify :: /29.2-/uniquify.eln - prog-mode :: /29.2-/progmodes/prog-mode.eln - backquote :: /29.2-/emacs-lisp/backquote.eln I suspect that the code which does the preloading may need to be patched and/or the preloaded packages may need to have their .eln files generated under a preloaded sub-directory (similar to what happens in non-Guix systems). Below is a list of .eln files that exist in the preloaded sub-directory in Emacs 29.1 on a non-Guix system. It's possible that the set of preloaded packages on Emacs 29.2 is different. I suspect that all of these packages are similarly affected. #+begin_example abbrev.eln backquote.eln bindings.eln buff-menu.eln burmese.eln button.eln byte-run.eln case-table.eln cconv.eln cham.eln characters.eln chinese.eln cl-generic.eln cl-preloaded.eln common-win.eln composite.eln cp51932.eln cus-face.eln cus-start.eln custom.eln cyrillic.eln czech.eln debug-early.eln disp-table.eln dnd.eln dos-fns.eln dos-vars.eln dos-w32.eln dynamic-setting.eln easymenu.eln ediff-hook.eln eldoc.eln electric.eln elisp-mode.eln english.eln env.eln epa-hook.eln ethiopic.eln eucjp-ms.eln european.eln faces.eln files.eln fill.eln float-sup.eln font-core.eln font-lock.eln fontset.eln format.eln frame.eln fringe.eln georgian.eln greek.eln haiku-win.eln hebrew.eln help.eln image.eln indent.eln indian.eln indonesian.eln internal.eln isearch.eln iso-transl.eln japanese.eln jit-lock.eln jka-cmpr-hook.eln keymap.eln khmer.eln korean.eln lao.eln lisp.eln lisp-mode.eln ls-lisp.eln macroexp.eln map-ynp.eln menu-bar.eln minibuffer.eln misc-lang.eln mouse.eln mule.eln mule-cmds.eln mule-conf.eln mule-util.eln mwheel.eln nadvice.eln newcomment.eln ns-win.eln obarray.eln oclosure.eln page.eln paragraphs.eln paren.eln pc-win.eln pgtk-dnd.eln pgtk-win.eln philippine.eln prog-mode.eln regexp-opt.eln register.eln replace.eln rfn-eshadow.eln rmc.eln romanian.eln scroll-bar.eln select.eln seq.eln shorthands.eln simple.eln sinhala.eln slovak.eln startup.eln subr.eln syntax.eln tab-bar.eln tabulated-list.eln tai-viet.eln text-mode.eln thai.eln tibetan.eln timer.eln tool-bar.eln tooltip.eln tty-colors.eln ucs-normalize.eln uniquify.eln utf-8-lang.eln vc-hooks.eln version.eln vietnamese.eln w32-fns.eln w32-vars.eln w32-win.eln widget.eln window.eln x-dnd.eln x-win.eln #+end_example --=20 Suhail This email is not an offer capable of acceptance, does not evidence an intention to enter into an agreement, has no operative effect until a definitive agreement is signed in writing by both parties, and that no party should act in reliance on the email or any representations of the sender until a definitive agreement is signed in writing by both parties. From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 27 19:18:49 2024 Received: (at 67260) by debbugs.gnu.org; 28 Jan 2024 00:18:49 +0000 Received: from localhost ([127.0.0.1]:56161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTssr-0002El-8A for submit@debbugs.gnu.org; Sat, 27 Jan 2024 19:18:49 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]:19255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTsso-0002EW-RT for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 19:18:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706401113; x=1706660313; bh=8X3IY5owU9tkZGE6OMiBo/sryTyrRiU4rZYwNqplZM0=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=mumx9TIIKkfUVE7IXnutJXkeerdyRfAQnREOGxjdB/9FBbJe3mGA1Aprf703Ti+6a 85RZuchZT41n1DLAMrn+DgJgjTvnb8+zzItDbUb/ngaHh6ZWH8xeRB2vbUb5u7O1he uZL6G5fLjaV3qmsf49nx5/+0884/tBKLh1QGiB9zNR9uoMC5JIv5jiWrycfNxyYk8J wXDdJpa8tJw3+LOFc+CcMJLLBjgxlB5Lly/WJ9NEyjQwofVgud8nHYi4aKkpbbaSLy 2cq0bD6pOfSL3FJHhtEsId8U9jm4fYTtf/vHIXjC/cmRUVPT1hbe6Uj3eMv5YY5Gdq NWnlvVzIR3T1w== Date: Sun, 28 Jan 2024 00:18:22 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87a5oq2tv8.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Suhail via Guix-patches via writes: > Below is a list of .eln files that exist in the preloaded > sub-directory in Emacs 29.1 on a non-Guix system. Minor correction. The list of files I posted was /adapted/ from the list of files in the preloaded sub-directory on a non-Guix system (with Emacs 29.1). Specifically, the list I shared had the hash su [...] Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.40.22 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Suhail via Guix-patches via writes: > Below is a list of .eln files that exist in the preloaded > sub-directory in Emacs 29.1 on a non-Guix system. Minor correction. The list of files I posted was /adapted/ from the list of files in the preloaded sub-directory on a non-Guix system (with Emacs 29.1). Specifically, the list I shared had the hash suffix removed to make comparison with the .eln file on Guix easier. --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 04:51:58 2024 Received: (at 67260) by debbugs.gnu.org; 28 Jan 2024 09:51:58 +0000 Received: from localhost ([127.0.0.1]:56605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU1pW-0003bA-Bl for submit@debbugs.gnu.org; Sun, 28 Jan 2024 04:51:58 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:52703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU1pT-0003ar-DM for 67260@debbugs.gnu.org; Sun, 28 Jan 2024 04:51:57 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a349ed467d9so169657866b.1 for <67260@debbugs.gnu.org>; Sun, 28 Jan 2024 01:51:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706435502; x=1707040302; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=N0AkzNpX+zeet33Cccc0xGH22EyCVbrlYGvh2X+ePw8=; b=fqgXAiQaSsM3bOokV1+8Kj49n5uWJNmSbB2BSJw3uVOPcfpaiKxBeMHGGAzsmispil 1ZxfDUmCxvqooz3lgV5HYpCJ8U2TZuMmCQc1MkNzWNcOu/gvVAeE+CrZuU0SAebnzGpr NCz9Yq1bPiDNI027/PxBkt3tfdVhyQFLtwyvVkVS+fMbdK7Q3chn4D7/v4/QoZGatgDA MNELPoX/IWXOjPHqq0Z3JOnluz/anMSYKUD53bYnxkrubbAXZHQuaGWf04/BHeKHaAHP 1W+lLsamDDgv3/OSoctv6Xy8zFDlnYFPPgQwjLc/S6KxaiQSt6JsLK1LdWaT2cc7cODG ZrCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706435502; x=1707040302; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=N0AkzNpX+zeet33Cccc0xGH22EyCVbrlYGvh2X+ePw8=; b=lFwTmOtp82Q3x1Corme1cyMvTuskWY8kC4iYMzO2LNxeuuMIvOUKzRR4FEl/BODE09 8Mc8ZFHbxrFNz2Kw4eOH2Tzkl7pDQChDwBmJ8kRCAM77o3sSfMr2xcYW53cyjAXVAlsK Edx3wFLm02N86V/zNL13VLUPcA1l9nJhAme1sl+x162hgqyHdtm3R9KUpCpu44/YTy76 /ntcC9ATPT+d36pjRP6Ga6zQQgjcWgk0fpxFzDiLwomVFMnzT7dnJsrVR4RV71QUM9lI vtPTUauT2m/sZ3n3ZujFFFad5QAVPy/RqtUH9HQZE2GQ4qecK6y611fAtKYm17GTUwVO 92yA== X-Gm-Message-State: AOJu0Ywb9mYEmk3MfxFjzKi8FxMiWG6jEAJExohHpRMKoBCnpoqAhdMc PxEBWArkxkYc+ToTc79DqeTDcjsEQUy2Of4vSG4/qWzJmN7tFIlE X-Google-Smtp-Source: AGHT+IFZCnn61hnJrmBeQ/VJ6a4aAzJFb8nMNcm44ojDW5QcMcF2QzlgfWSgEYuFFnvSLXGOB7quSw== X-Received: by 2002:a17:906:faca:b0:a2f:e18:fae3 with SMTP id lu10-20020a170906faca00b00a2f0e18fae3mr2099914ejb.41.1706435501429; Sun, 28 Jan 2024 01:51:41 -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 hw20-20020a170907a0d400b00a3515b35be4sm2111877ejc.104.2024.01.28.01.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jan 2024 01:51:40 -0800 (PST) Message-ID: <96b31b76703e740065654996acd74e44a6be97c1.camel@gmail.com> Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. From: Liliana Marie Prikler To: Suhail Date: Sun, 28 Jan 2024 10:51:37 +0100 In-Reply-To: <65b59c2b.5d0a0220.2cacf.b39dSMTPIN_ADDED_BROKEN@mx.google.com> References: <65b59c2b.5d0a0220.2cacf.b39dSMTPIN_ADDED_BROKEN@mx.google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 28.01.2024 um 00:13 +0000 schrieb Suhail: > Liliana Marie Prikler writes: > [...] > > but =E2=80=98uniquify=E2=80=99 remains byte-compiled for no explainable= reason. >=20 > And too that as of v8 patch, uniquify still isn't natively-compiled. > However, if you unload it and then reload it, it becomes > natively-compiled. >=20 > #+begin_src bash > =C2=A0 emacs --batch --eval "(message \"%s\" (progn (unload-feature > 'uniquify) (require 'uniquify) (take 1 (split-string (substring-no- > properties (describe-function 'uniquify-item-p)) \"\\n\" t))))" > #+end_src >=20 > #+RESULTS: > : Type q in help window to delete it > : (uniquify-item-p is a native-compiled Lisp function in > `uniquify.el'.) >=20 >=20 > I think the issue is because uniquify (along with some others such as > prog-mode, backquote etc that I tested) are preloaded in Emacs.=C2=A0 I > believe that these preloaded packages need to be treated specially.=C2=A0 > In a non-Guix system, these preloaded packages have their .eln files > stored under something like > /29.x-/preloaded/ , whereas in > the v8 series there is no "preloaded" directory.=C2=A0 Instead .eln files > for packages such as uniquify, prog-mode, backquote etc. are in > various locations: >=20 > - uniquify :: /29.2-/uniquify.eln > - prog-mode :: /29.2-/progmodes/prog-mode.eln > - backquote :: /29.2-/emacs-lisp/backquote.eln >=20 > I suspect that the code which does the preloading may need to be > patched and/or the preloaded packages may need to have their .eln > files generated under a preloaded sub-directory (similar to what > happens in non-Guix systems). >From my experiments, the installing of these files is a red herring. I instrumented lread.c to print the relative and absolute file names tried, and it appears that these aren't loaded at all after install while EMACSNATIVELOADPATH is ignored when dumping. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 11:18:12 2024 Received: (at 67260) by debbugs.gnu.org; 28 Jan 2024 16:18:12 +0000 Received: from localhost ([127.0.0.1]:58234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU7rH-0001Qe-UU for submit@debbugs.gnu.org; Sun, 28 Jan 2024 11:18:12 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:58959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU7rE-0001QA-Uk for 67260@debbugs.gnu.org; Sun, 28 Jan 2024 11:18:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1706458673; x=1706717873; bh=aYj1zECbRZiWi6lLuSQaQ7ELhViqRhbLQ0IIgw2Mp00=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=VKA7U93qGSRnH+hjVqZI+SUDG9Z2ucutLN1NdqgpWQ0syjs9VaDmd5Bnmuoy9gt8d Rh9DIsQTUnfEpjTsDjzDrsVC9o4a1uaF8Wq3ysT4a4vn2XrqqxXzkoLkHYkQ5C6vxV CubfjInAviF3y5FnN750Lop4d0QbKT+VPJxOpDl03n2XEiyuEfUz4RmcXo+9ffln6i wr3Te9+Pn0Ccvp1jWJ6PF8v8A9DMRTF2bqEucrcUyzD8z30EIegecgew6fNYSS574k pSDTmUzi7n/hAiXzMPuP7j+klZOfv6WuKqHd3UEuJirVrPXKhba7KA/uD2T6B+WoxE LspqI7R3c4oiw== Date: Sun, 28 Jan 2024 16:17:47 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. Message-ID: <87il3dph3s.fsf@> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: I'm assuming you're able to reproduce the issue on your end as well with other features like prog-mode, backquote etc. Liliana Marie Prikler writes: > I instrumented lread.c to print the relative and absolute file names > tried, and it appears that these aren't loaded at all after install > while EMACSNATIVELOADPATH is ignored when dumping. Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H5 RBL: Excellent reputation (+5) [185.70.43.23 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.2 INVALID_MSGID Message-Id is not valid, according to RFC 2822 -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) I'm assuming you're able to reproduce the issue on your end as well with other features like prog-mode, backquote etc. Liliana Marie Prikler writes: > I instrumented lread.c to print the relative and absolute file names > tried, and it appears that these aren't loaded at all after install > while EMACSNATIVELOADPATH is ignored when dumping. Interesting. I did a grep of the Emacs source (branch emacs-29) and line 1770 of src/lread.c (in maybe_swap_for_eln) seemed relevant: > /* Look also in preloaded subfolder of the last entry in > `comp-eln-load-path'. */ What surprised me was that not only was the "preloaded" directory special-cased, but so too was the last entry of "comp-eln-load-path" (which I imagine is referring to native-comp-eln-load-path). Judging by your message, I'm guessing you're well aware of this. I, unfortunately, have no additional insights or suggestions. However, given that ensuring Emacs is able to find the natively-compiled version of files seems non-trivial, it might help for a future patch series to be accompanied with tests. Thoughts? --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 28 11:50:33 2024 Received: (at 67260) by debbugs.gnu.org; 28 Jan 2024 16:50:33 +0000 Received: from localhost ([127.0.0.1]:58273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU8Mb-0002WB-Ap for submit@debbugs.gnu.org; Sun, 28 Jan 2024 11:50:33 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:48376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rU8MZ-0002Vx-Nt for 67260@debbugs.gnu.org; Sun, 28 Jan 2024 11:50:32 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a354fc17f24so95103166b.0 for <67260@debbugs.gnu.org>; Sun, 28 Jan 2024 08:50:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706460618; x=1707065418; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=fC4vL8anVT0m1knQIwhxXpMDyKVKd7XPIHN5L7VVQBg=; b=Wp6+auwnphNBVHUbPs2nf2JOX1DdtnyCKZu6F48ZFiGjyhF4OtlZMFBFsdAe8ZL83p IkTIlwpV1ZLeveI12EzrX9O3KYoMFWKfnEZt0uMc4bXw8Z6pEtPmUQbkKctrpUqBdM0U 7sOjsY05vTLT2cZU9XLtktPH2XkLFvNe1eU9io2hZyeEPI1VqFdo9ZSTfBDxWXgoFbE8 Z9dtgzSltrsgafFCdrtwYid0cYHeqFx4COeNcZH+q+Qro8zGH0W6vG+gkfKUcNYEaMU6 Qge1Sfz7haBICsX70ABSn7duJGKPyotN+Krb6SuaJoW9hFsuk+6I6FSXMpp6Z6gdUh6w F3DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706460618; x=1707065418; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fC4vL8anVT0m1knQIwhxXpMDyKVKd7XPIHN5L7VVQBg=; b=QCFego9T58JXkez0R4fRPgco4U0K1VLdXTGy0ZYALvNQJkeZd2quZaarT1t+/7mh1m UK1G9CZqAIFrpVNDAbG4GYA8BCcOMhMSCxvvIzSyAsQtvJl1pPsAkzYIOH6PyrMauvIw AUrVtupvqW1CMKCH0ewDJhYRyeiZb6YUu2ICvm1CleK7cY09D0Yb8xfPZx5aOnt+zY6l lCKDStjLG167cg1LZXSyE/bBM1E7+htky8wKdy51/mabMY72zhlLJnwY8kb0fKuhQuXS Ho2y/18wnAW0qGHral0/z8N+lJnJqzWKCL/w2HeJlpR8ETNFRrsV0UAKnVHBQ3Acajoz V81w== X-Gm-Message-State: AOJu0YyEypdXrr8LFs/B+FgQZpwnbsql/Q0NScRa/maz9MvnJRTFR7Kg 8RqMcXLwjcF94mD1ftoRJrZYtcX59ZxgmsVc6MU2mQWVrmZlSOYN X-Google-Smtp-Source: AGHT+IHQONQaHadSeAPDev9ZuIKW3LuBPdEpK9lbvxIK9/60aUksHZM0tg2k6m/jqfA5EY4Fagt2RA== X-Received: by 2002:a17:906:5ac8:b0:a35:40ca:c8df with SMTP id x8-20020a1709065ac800b00a3540cac8dfmr2657302ejs.7.1706460617812; Sun, 28 Jan 2024 08:50:17 -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 rs10-20020a170907036a00b00a316a652c6csm2988576ejb.70.2024.01.28.08.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jan 2024 08:50:17 -0800 (PST) Message-ID: Subject: Re: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. From: Liliana Marie Prikler To: Suhail Date: Sun, 28 Jan 2024 17:50:16 +0100 In-Reply-To: <65b67e33.df0a0220.72d31.84b1SMTPIN_ADDED_BROKEN@mx.google.com> References: <65b67e33.df0a0220.72d31.84b1SMTPIN_ADDED_BROKEN@mx.google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 28.01.2024 um 16:17 +0000 schrieb Suhail: > I'm assuming you're able to reproduce the issue on your end as well > with > other features like prog-mode, backquote etc. >=20 > Liliana Marie Prikler writes: >=20 > > I instrumented lread.c to print the relative and absolute file > > names tried, and it appears that these aren't loaded at all after > > install while EMACSNATIVELOADPATH is ignored when dumping. >=20 > Interesting.=C2=A0 I did a grep of the Emacs source (branch emacs-29) and > line 1770 of src/lread.c (in maybe_swap_for_eln) seemed relevant: >=20 > > =C2=A0 /* Look also in preloaded subfolder of the last entry in > > =C2=A0=C2=A0=C2=A0=C2=A0 `comp-eln-load-path'.=C2=A0 */ >=20 > What surprised me was that not only was the "preloaded" directory > special-cased, but so too was the last entry of "comp-eln-load-path" > (which I imagine is referring to native-comp-eln-load-path).=C2=A0 Judgin= g > by your message, I'm guessing you're well aware of this.=C2=A0 I, > unfortunately, have no additional insights or suggestions. >=20 > However, given that ensuring Emacs is able to find the natively- > compiled version of files seems non-trivial, it might help for a > future patch series to be accompanied with tests.=C2=A0 Thoughts? On upstream, this would add ../native-lisp/preloaded to the search (since everything is dropped in one directory, this probably works as expected), but with our patch, we do multiple directories *and* drop ../native-lisp from that early. We could try expanding EMACSNATIVELOADPATH earlier, but we can't yet use Fgetenv_internal. But yeah, we're looking at the same source file right now. Cheers From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 14:31:17 2024 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:17 +0000 Received: from localhost ([127.0.0.1]:47400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUv-0004DN-Df for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:17 -0500 Received: from mail-lf1-f49.google.com ([209.85.167.49]:61615) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUt-0004Cr-HQ for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:16 -0500 Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-511831801f3so3586561e87.2 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:30:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852592; x=1708457392; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=fCiWq5c/taiUsyHC3y14QbYPa3eWgIEmDzE9QfxVfAzgasJ71RHIMVrGGxfibWxuy6 gurUd6lzwEthoG84i2O1nb2bA1cojh23Qg/n0jvfnVdNz5qwbakhWCB0zYtDgpxHyZ2W spMkNrybPdfI/uwT8c4Wbmb21AVb0+sj4FzcS29iN+wRs+wZo9Q4Q5ff3q7epHN2eq21 SiyF53xd8Vf2KSF/nDNIH23dTFR4hBLXwpF6oS/1H+/hbli10Pp1wGrZrsTB86YmGT7R ArtL3x9vnxsNQMfKF11vsccnljcvySirdo5C1XjRb+jeyk94f751IFb8qtJwMW7GQTYm ZF4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852592; x=1708457392; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=bR5APIAvr0LTr4Dz7N44ZBp/hWXxGxI1Urk/RSCiJOg4rKZYoNZPclxihdE7cTl1qk bFEZVwK0g92YSEP6rsviWxxyYxgIDkSDQ0cK1fcgZBGpXqWXMo0S0Hg5Uy1EcD5iBIPk 7N69cRVeKdAqJrWpI8wowiUqQmQgg8Igy1BsguCv5KexhN8ZA2+NXqglfWwX0qQkzJtp +MY6clm85GrhCdzpscJ1IaOybGvhKkb1rEpuRd6yvUfgviWMSDNj+0b3rEMgDZ+7kMms AtkeD9J+xkuGG+ef2Kwl3+EmldtfDo3kNZqz3C6KWwj0TVChmjHGSOhKGTjYqK/6mWN9 vYCA== X-Gm-Message-State: AOJu0Yx4Tu9V0uAc5VLkoRanmJXELBOLxzADcA8Q4ZtLP3RHIKXFPvOC NCnNz821qT1DHEsMX7BjmZY7h6B6ZCAHnxWXmravsmyRI6U6qsbhG7bnYMOo X-Google-Smtp-Source: AGHT+IG8rGi/tne6/LXFijVTmi8IQc1Pgmbq4qxVyCtSzEkmMQGzxOhqIcjVCcr7lI4dBNn5RMpYLQ== X-Received: by 2002:a05:6512:3a8b:b0:511:6764:a8c7 with SMTP id q11-20020a0565123a8b00b005116764a8c7mr455446lfu.10.1707852591610; Tue, 13 Feb 2024 11:29:51 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCU3NqobwQxymWQQzX6WjF1SHt4R2eesN8jMrdSVVfqVJAmGIksBsOiQixULEGtE4rhpbsxkXdHK29nKXM28fOP6ue8BTygzPrReNSKPvplK9Ut0m9LI43nh4vjtYbSd Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:51 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 Subject: [PATCH v7 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 14:31:19 2024 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:20 +0000 Received: from localhost ([127.0.0.1]:47405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUw-0004DY-PN for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:19 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:57388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUu-0004Cs-IR for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:17 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a36126ee41eso646864766b.2 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:30:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852593; x=1708457393; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=kDYfN8M1+fXYjbA6CYKqrdhQc4X2H2GVQmzkmZ/uDdCISd/d/qLNRYuRC/2CokEZBq V5WJAafhFcm8Mz8wcV37VM1Audrwu/aB2sDaWX43BKvUJFA6JT9fN7oE3p80v6sfKWIr G5rjRKIL68wU2smGk84Na/IINpf6zJGhACgc3BEBIZaTRyoyEynh0gT58wOaGatnv0qO uBZqa7NrpCvl4T82tpwbSMixL275NI4Z8ZdtzkrIh4GCvlE5AhDr2UZpzJlA07k7a+FB dDFzw3jQ6aEqKAXDGIAhwD/FywlbxyJC0in5XwTqbcGjD3nnhznP6XTWmkh1U2GfBYei JSFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852593; x=1708457393; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=onMawsVxn8i9PdXwiV2d8b7tmcu6S37p4j25dZk+8bp5eVl9RmYqSzAGNAwJRB3zNj ODlOQvFgRESMQqDTmxXUIfCMMUcfuqNP48v1VJnX1UGXWRDMQhyRWKlQW337ZBkayYF7 Q/joc35PwNlBVDXtT52iLePDIEH0OG09fFxV95n0di6+m7Y1dwEmUWGRtMBlc5OAt5Op X3o569tMpCl60zWeaxfTCKOUrLJBgEfpppzNFTcPHgkPXGl0S+9xrUGt6i5FXiOzd+si Cfymrky+zV55VHau5plscQWXWo+3SoTusJSR1PPYMSYbx/eG0n1HqsiB20ExFTmAB/GN BqSQ== X-Gm-Message-State: AOJu0Yy8fWzOU4IEW8B/DCjhkpCT8pMidRX/Vkbxpn3+CPb3S4q9kXqC A3LQT2eFUx/cha6YMrghHcAaqIxr8El/HrqSAe7JVt8XRDNe+xjZHO2lI8TU5po= X-Google-Smtp-Source: AGHT+IHzuaeobhW0YW2RJakW3Isww7Ym1nOXaNd6r77g50Y3l7hnye2eGLsWUf/OlGl37c0+tXm06A== X-Received: by 2002:a17:906:4a10:b0:a3d:19e4:113f with SMTP id w16-20020a1709064a1000b00a3d19e4113fmr222178eju.76.1707852592923; Tue, 13 Feb 2024 11:29:52 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWQyJKi6MazaMNlE7eIHEUUCRJfGxyyurFJlNvUQBSFgaamSb6Lv9cqvTUZDKY+py6t0ZO2R4FllYZyBxEXt4jPyFSUmB2rDeI04kQPASPsnPmuxfro9QtuQWIhAQj3 Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:52 -0800 (PST) Message-ID: <4fe9c932cc5f7d959df5cbc801dfe43f7f817385.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 Subject: [PATCH v7 2/7] gnu: emacs: Build trampolines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 14:31:24 2024 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:24 +0000 Received: from localhost ([127.0.0.1]:47409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV1-0004EE-R6 for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:24 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:50398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUv-0004Cv-TL for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:18 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a38271c0bd5so597782966b.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852594; x=1708457394; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=A3DWsjBZx9+0/R70FWM+AN91HMhqnnh9kiwU+sBIaTK08pdUUy65OUxzYBP21wQmvk F7b260fNE0Q+Tn5BbPzC5f60dgLoe7YzpXTnlYqswuxVdmEyp2EEN3RTxWw1b414D596 lApXoqb2nLBTmP7mI2OxciWjlt1eHNEEeqeEEtxHgLcJkACz6ogTNBwg6ZIdpMkSB4J5 abkZe6tgA6bFAEbbQCZj65X7itDsZxCA08Fl/BuxzuGs62WpxbcJ06MAMr+90Lg4oUPG NbjHIcD4IBkZxwVSvC86GmhZLi3TAqSpR3hRmMqvU+JeW/QwHTIyLi88bn9zJEQ7ZeBk b9sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852594; x=1708457394; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=dXH6IbvblAcOFd3B+FNBtcwhJR3wQY0n5pgwKdBX9hhKvXaFsU1k9dg1MZgu5Lyb+B FlL0ByDRtFjNCF5NmfZgY7peKXuqPLN2MotTp/ZMTBfu++sj9oFBlZlBkIDUeDoYGrzJ 4OsUz/TFjb+rgwmjnh5hduNtyDw/yoIsNQ98XEWCp4xX+SnmaNCwFtjDvWOxqp5InYmu uHca26BzlLeRjGVIo3+qijW2JTPShbMqfPD/exmlNpNjS1bxIHXJCXcuwWDbWDPuz4ht MLHITpnf99gi9XyCtVnNBQwg2b4ZF0BtijV1UKvl7FS4Dxc6ynE58xHoNXtT6rRvKbl7 maOw== X-Gm-Message-State: AOJu0Yz7g9U+Yv7i9yzu8nxnMK387LZRqr2s8MdGjxbutMbwsgo/LehB p8AM26vN/9Jhkm11x/1yrXQOwMIMYQ4GgMht4WmRi945g9tUDv3+fIDaU3RIcg0= X-Google-Smtp-Source: AGHT+IG/2anms+UQ6gr2OBbHpcTAS8r9N00PDt8WAjnPERshcV6H3kfJ8rggSi60O38tjmY3syzRmg== X-Received: by 2002:a17:906:eb50:b0:a3d:765:7bdc with SMTP id mc16-20020a170906eb5000b00a3d07657bdcmr236089ejb.25.1707852594374; Tue, 13 Feb 2024 11:29:54 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUMAHHx8VzazGN/Z7CGqUi0hl+d61cmEMDvwv1qTFxv0kcjA39BANNvDy0ZMqlyUwG9rhfgOOSNaxwzf5d7x7q8DZL2PeI5+jgsMxNxy9/bd/EsYbSUIRZz9MBR1zzP Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:54 -0800 (PST) Message-ID: <2188ddbfcdabbba12df18a4c3af34b123ea8448d.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 Subject: [PATCH v7 4/7] gnu: emacs: Disable jit compilation. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 14:31:24 2024 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:24 +0000 Received: from localhost ([127.0.0.1]:47411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV2-0004EG-C8 for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:24 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:54461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUw-0004D2-Bu for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:19 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a3832ef7726so564141766b.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852595; x=1708457395; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=cGWrrSYNEVAOevKGkjDPbT2MejlDiD3jPVeFtWlPW7c2f6wgbyguqdidnANHIK8EA5 GPTmZdJj/DF10wApSjBfYyOeaKpNX9g1/V0K9DJI7q9sZNyi7TDfKDHTlKOlSPWNC3Vk SQeFm1NjqoCjNGPo/l+BnrPJZAe3QppRVHJTu2uv55ORcKlHVbTAT3Jz0QPFCH2qNBEF yqnYttH0cQ+g3gFZuc8bTbDi+fGsiT4wN1UHiBXliGrjt9Chiuqa8sSKGwVZzZ9e6sZT NPJocpvOtH7TB5IflmQ+XKEJQidzEdD2PmXwP3UBOHSCHpSkI9g4p+iNAZyLaa1qwG0C tL5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852595; x=1708457395; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=eYxltGf+FU2H7WqkEMhVUdiv2VxFXTsFX3iPBGV34oAckBxYPhjBjjOnKXydshxSJR ZT1mh93PFfXSM6oNlVTMTILho/LzuuLXu72P8CHk3DStsPhDPsMNa+hZSiKD07RhMFFq 1a+HNWELGfpZV6HtZzh6ZKeJ1pGPbHL13B/h8QPFbVC1CXNN0btV/LEAvCYfAQi+4KGo QG4Y5gXwvU5xoqHTfzAkuHA18THLz+QZh1Q6B3ka1sFwm7fSPwJSEgeBnnQsP6wIaelo BzNd/Y12hy56+u/6cpofAFTQ/V+4oBBdNwSm5ENY8/XhsRY8hRFssX1KmJxjUnZnBJ5R Dzmg== X-Gm-Message-State: AOJu0Yz/IeScWcR3xuZsti1YyXC+UFguluZDsj5BQD2tphEUT387RUxs P3YLECKQ2ocgIjlBRbsW5AjqDaP5rHUs9PTYZpkpiKgvbyQDTBRA1JI51SHhQe0= X-Google-Smtp-Source: AGHT+IEULKh7FQV54+q/xeZbyOARAdIF+hDQfhTXl+AZITegACfGD2sxABPOa1U4c/pe136+/HRILw== X-Received: by 2002:a17:906:f0d1:b0:a3d:1771:26c6 with SMTP id dk17-20020a170906f0d100b00a3d177126c6mr247852ejb.2.1707852595112; Tue, 13 Feb 2024 11:29:55 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUT2KGqEAiReydhQKPn7i3L2jYYIbhxXpFzSXcyQjPEXZ6cIr/2JanQbJ7CzBt5izDZjI6mTvrslzy0ML0Hvxi28PwLJGpTVjss9sCjv6m6TFZVeMMdb7vs+vDYG+Ls Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:54 -0800 (PST) Message-ID: <3604eaa2d70ad07a9c80c5166f42fad536b63a77.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 Subject: [PATCH v7 5/7] build-system: emacs: Compute relative file names. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 14:31:25 2024 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:25 +0000 Received: from localhost ([127.0.0.1]:47413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV2-0004EO-N2 for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:25 -0500 Received: from mail-lj1-f178.google.com ([209.85.208.178]:56357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUx-0004D3-AU for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:20 -0500 Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2d073b54359so69679091fa.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852596; x=1708457396; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=UroKhEej0FS6QK8rbL4HuWE8cY9tZMeI8e40BhDUBZqESeQO4//2L8/ft8Idmh6pDF kTYvnfKyiNUnXrN6hCG3zQQWKYri6QMgM6nx1KK76orpEPjn/c+2fVwBhHcwB1ztKyCP vAoJ3cnekpGEgba4qyeoEFiwivHYcWOk/4WLvJQHFd7b0rS2YN9SXIRWveAlg7ZTLNwh P6RIzdq/tz+UBY3Oi9EwsKFeaWPd/9BDk0YZIIZQ0SCc9fhrVjZErPcCer0YUu/QbDqL CSbpE6caABs6XVtM6OmRx16gve0ID7LdVnIlCjRieWxQxjGx+1jKcfRDpHTVEGx+vO8o goLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852596; x=1708457396; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=ViFj7424WjGOMetF/R1ZeYPmEtlL2PKfNPkNdYYfzFnsZvtn0eW3kzKtgyADaCY6cb YrT8yNHcYKsnqf+EfDWlxrWEl6M1mWMYI4HFBqXg5RY1XqBMVOclT0rYLOM4izex0SLq L4kNJsbS8MQ63M9GSQwhBESHjYyyU8JThPnRHPqlDsZvwcoVMQg26nnTD60ZFbH7iOHx Ieo5N7woB6U8UkXzzWq6NKqBatcgZl94kjg7s4N13uGKtwvaYVZ32i9zeNQ4Qx+Bdcq0 8RUAWbDjvVstNBf1ZuXtRLA1VEEdbrIA/Droz0cS3cF/x/uaYr+JwebMe3qwmm4v5pVR NDDA== X-Gm-Message-State: AOJu0YwvFNrkU8HeTfxWCAw6dKGI+AOfrt6qVlFS2V3sprQCSkQhJRg6 9MlKXF7t2VQ7y55OGJl6h/UoJ3UdR/Y0+T1wXNhcdQ9WPRuFgKS4KlxpIzb9 X-Google-Smtp-Source: AGHT+IEr9YTHfbC7xaPqC5voPa9ZeZ5to4PexNAVI0BQwfcuxt3gtPynsQKd3ZIKDl/KW0Bkwc+xCQ== X-Received: by 2002:a19:7501:0:b0:511:4e8c:7d02 with SMTP id y1-20020a197501000000b005114e8c7d02mr355112lfe.48.1707852595833; Tue, 13 Feb 2024 11:29:55 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXQ1csdhj270MHYoi5VkGiYhK5pogp/paxNmxm4zjZuGgSI8vEqHFMBlL1yrF95OlsjawLyMy3Vn9LHwEL61XTRDBjX3WCGC1oZFE4KVolWQnd5TdJ/aJJ0v7ZsqySQ Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:55 -0800 (PST) Message-ID: <7946bcd3c810575ddb31ff84bce16b42375b7513.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 Subject: [PATCH v7 6/7] gnu: emacs-org: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 14:31:26 2024 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:26 +0000 Received: from localhost ([127.0.0.1]:47415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV3-0004EV-5L for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:26 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:43206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUw-0004Cw-6L for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:20 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a30e445602cso16317766b.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852594; x=1708457394; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=unx0WlA09N7LGaCQR5w6UZT4NRsTI6qSoHqG9oNqu1k=; b=f3ou0R0toySzjcGs/OpJ7NrHJle/YkyDtynVENB52lSrv/7gpJH5twToxxk36uQsCg LvoxsW7VGV5Th+FoWUgew2zr+N2g9nDsf89AgI/1Bw7k9DB8arP8DMiz+mozlshFwtF0 iwUOVDJJtA45bExaoDlcdrksxQ/5k5p2wzyxPY83Y9qs3uP+1+Rlv+PvaMM/06IoOYbX OezlqiR2I9iNtmRgaS2j+xWd030zS4GJYaaUkfDSG+F6vUfops5vzRDKxx3Zh9yDwqXo orvT5YXQzN/zkQXRa9cWnT86ihTBpcMBoB7KS2X3q3lY+ysqa+Z4HNX5a+T8RNv8tk5/ niGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852594; x=1708457394; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=unx0WlA09N7LGaCQR5w6UZT4NRsTI6qSoHqG9oNqu1k=; b=HdFFaiks2SG1Bh00k21gr8a+0fgEg8Nc57SXDDxv5x9hnxlwYf8EzdWQA0lBD+/oMP AfltM1JBDxfkYY0I5haB7ZwAyzqPWnWZ1m9Bv9EvocRjoYKbcHcUUsMVToCXg4ROqOR/ Dav/ZEgrRuCjaFL2Ie04p04OgiZodnoMIiwX0JMhb/Zyj58NkLugXaMLr7L9DB2WPNP8 rnCKVVFXuUKPEbLj6cdKfrf1MEWhwRTNHm9ByS98tRZo3bX/vWVIyUnTE5pRPSfqggv7 tS2R8Pvv1Em5zIkM87xRL+drRA0kWt8i/QzqITF9Sw5pTzhJHCFCrbKoabwXvsoakyRc JxVg== X-Gm-Message-State: AOJu0Yy8EXeJP1py9tSZ2T1/w0DcqGyoW2DnNZkldvE56BJ7tRs77+hd EEgROkqgAouh+8dmk1MKa1y0WAoK+UsLMB5Oncj0XEq22ycP0KcFpJ20JTVP1xk= X-Google-Smtp-Source: AGHT+IEedvko7D2Bq9FpivwFzEuHafO1XrBnG7bMXp3elaMLyn4sBrMQoi84EcqhskylCGRSQ0vW/w== X-Received: by 2002:a17:906:fcb6:b0:a3c:2c8e:9030 with SMTP id qw22-20020a170906fcb600b00a3c2c8e9030mr2960352ejb.6.1707852593670; Tue, 13 Feb 2024 11:29:53 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUGygQtxBh+eNXddPovI1bQhXHKBySGEtPJRuLA4L7qULdHTrHY6ZXVLF36AfUXtMbFHNKvgmeRL4W2E4yhQCw0qz62nYC3bvJK4Lsu3OhgoI0gCqN2QTzhBZx4Ca/l Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:53 -0800 (PST) Message-ID: <60a52b40655fd27afa7d35564fb640c435c215b1.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 Subject: [PATCH v7 3/7] gnu: emacs: Don't hash file names in native compilation. to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- Am Sonntag, dem 28.01.2024 um 16:17 +0000 schrieb Suhail: > What surprised me was that not only was the "preloaded" directory > special-cased, but so too was the last entry of "comp-eln-load-path" > (which I imagine is referring to native-comp-eln-load-path). Judging > by your message, I'm guessing you're well aware of this. I, > unfortunately, have no additional insights or suggestions. Welp, I managed to find a workaround. The emacs produced by this patch has its own native-lisp directory twice (once per wrapping, once per bootstrap), but it ought to load your natively-compiled whatever fine. Cheers gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 322 ++++++++++++++++++ 3 files changed, 324 insertions(+) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d1afd4555..7e6a0c5006 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1121,6 +1121,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0292b1bd16..1caa2cbee0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -111,6 +111,7 @@ (define-public emacs-minimal (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" + "emacs-native-comp-fix-filenames.patch" "emacs-pgtk-super-key-fix.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch new file mode 100644 index 0000000000..8e9f9a8fd6 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,322 @@ +Upstream hashes both the absolute file name and the content of a file +to derive the name for the natively compiled files. This breaks the +staged install used in guix, as any $GUIX_PROFILE is distinct from +the build directory. It also breaks grafts, as hardcoded store file +names get rewritten; thus changing the file hash. + +In addition, this patch changes how native-comp-eln-load-path is +constructed. Upstream, an entry of the directory “../lisp” is added +supposedly for bootstrap only, but this directory appears to find its +way into the actual variable despite attempts to remove it by calling +‘startup--update-eln-cache’. +The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as +packages may require it, but only pushes the new value now. + +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -4396,26 +4396,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc + Scomp_el_to_eln_rel_filename, 1, 1, 0, + doc: /* Return the relative name of the .eln file for FILENAME. + FILENAME must exist, and if it's a symlink, the target must exist. +-If FILENAME is compressed, it must have the \".gz\" extension, +-and Emacs must have been compiled with zlib; the file will be +-uncompressed on the fly to hash its contents. +-Value includes the original base name, followed by 2 hash values, +-one for the file name and another for its contents, followed by .eln. */) ++FILENAME is resolved relative to `load-path' and only the suffix of ++the first matching path is kept. If FILENAME is not found to be relative ++to any directory `load-path', it is used as-is to construct the return ++value. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); + +- /* Resolve possible symlinks in FILENAME, so that path_hash below +- always compares equal. (Bug#44701). */ +- filename = Fexpand_file_name (filename, Qnil); +- char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL); +- if (file_normalized) +- { +- filename = DECODE_FILE (make_unibyte_string (file_normalized, +- strlen (file_normalized))); +- xfree (file_normalized); +- } ++ Lisp_Object rel_name = filename; + ++ filename = Fexpand_file_name (filename, Qnil); + if (NILP (Ffile_exists_p (filename))) + xsignal1 (Qfile_missing, filename); + +@@ -4423,64 +4414,54 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } + +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; + +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); + +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object directory = Ffile_name_as_directory (XCAR (tail)); ++ Lisp_Object len = Flength (directory); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ directory, make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, len, Qnil); ++ break; ++ } ++ } ++ } + +- if (NILP (loadsearch_re_list)) +- { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); + +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) +- { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); +- break; +- } +- } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4475,7 @@ If BASE-DIR is non-nil, use it as the di + non-absolute BASE-DIR is interpreted as relative to `invocation-directory'. + If BASE-DIR is omitted or nil, look for the first writable directory + in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory +-whose name is given by `comp-native-version-dir'. +-If FILENAME specifies a preloaded file, the directory for the .eln +-file is the \"preloaded/\" subdirectory of the directory determined +-as described above. FILENAME is considered to be a preloaded file if +-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME +-appears in the value of the environment variable LISP_PRELOADED; +-the latter is supposed to be used by the Emacs build procedure. */) ++whose name is given by `comp-native-version-dir'. */) + (Lisp_Object filename, Lisp_Object base_dir) + { + Lisp_Object source_filename = filename; +@@ -4541,19 +4516,7 @@ the latter is supposed to be used by the + + if (!file_name_absolute_p (SSDATA (base_dir))) + base_dir = Fexpand_file_name (base_dir, Vinvocation_directory); +- +- /* In case the file being compiled is found in 'LISP_PRELOADED' or +- `comp-file-preloaded-p' is non-nil target for output the +- 'preloaded' subfolder. */ +- Lisp_Object lisp_preloaded = +- Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); +- if (comp_file_preloaded_p +- || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), +- CALL1I (split-string, lisp_preloaded)))))) +- base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + + return Fexpand_file_name (filename, base_dir); + } +@@ -5863,10 +5826,7 @@ The last directory of this list is assum + the system *.eln files, which are the files produced when building + Emacs. */); + +- /* Temporary value in use for bootstrap. We can't do better as +- `invocation-directory' is still unset, will be fixed up during +- dump reload. */ +- Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); ++ Vnative_comp_eln_load_path = Qnil; + + DEFVAR_LISP ("native-comp-enable-subr-trampolines", + Vnative_comp_enable_subr_trampolines, +Index: emacs-29.2/lisp/startup.el +=================================================================== +--- emacs-29.2.orig/lisp/startup.el ++++ emacs-29.2/lisp/startup.el +@@ -545,9 +545,6 @@ DIRS are relative." + (defvar native-comp-jit-compilation) + (defvar native-comp-enable-subr-trampolines) + +-(defvar startup--original-eln-load-path nil +- "Original value of `native-comp-eln-load-path'.") +- + (defun startup-redirect-eln-cache (cache-directory) + "Redirect the user's eln-cache directory to CACHE-DIRECTORY. + CACHE-DIRECTORY must be a single directory, a string. +@@ -558,22 +555,10 @@ to `user-emacs-directory'. + For best results, call this function in your early-init file, + so that the rest of initialization and package loading uses + the updated value." +- ;; Remove the original eln-cache. +- (setq native-comp-eln-load-path (cdr native-comp-eln-load-path)) +- ;; Add the new eln-cache. + (push (expand-file-name (file-name-as-directory cache-directory) + user-emacs-directory) + native-comp-eln-load-path)) + +-(defun startup--update-eln-cache () +- "Update the user eln-cache directory due to user customizations." +- ;; Don't override user customizations! +- (when (equal native-comp-eln-load-path +- startup--original-eln-load-path) +- (startup-redirect-eln-cache "eln-cache") +- (setq startup--original-eln-load-path +- (copy-sequence native-comp-eln-load-path)))) +- + (defun normal-top-level () + "Emacs calls this function when it first starts up. + It sets `command-line-processed', processes the command-line, +@@ -1362,12 +1347,6 @@ please check its value") + startup-init-directory))) + (setq early-init-file user-init-file) + +- ;; Amend `native-comp-eln-load-path', since the early-init file may +- ;; have altered `user-emacs-directory' and/or changed the eln-cache +- ;; directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + ;; If any package directory exists, initialize the package system. + (and user-init-file + package-enable-at-startup +@@ -1502,12 +1481,6 @@ please check its value") + startup-init-directory)) + t) + +- ;; Amend `native-comp-eln-load-path' again, since the early-init +- ;; file may have altered `user-emacs-directory' and/or changed the +- ;; eln-cache directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + (when (and deactivate-mark transient-mark-mode) + (with-current-buffer (window-buffer) + (deactivate-mark))) +Index: emacs-29.2/src/Makefile.in +=================================================================== +--- emacs-29.2.orig/src/Makefile.in ++++ emacs-29.2/src/Makefile.in +@@ -553,6 +553,7 @@ shortlisp := $(filter-out ${shortlisp_fi + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS = emacs-lisp + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. +Index: emacs-29.2/Makefile.in +=================================================================== +--- emacs-29.2.orig/Makefile.in ++++ emacs-29.2/Makefile.in +@@ -329,6 +329,7 @@ TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. + unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++export EMACSNATIVELOADPATH = @abs_top_builddir@/native-lisp + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` +Index: emacs-29.2/lisp/loadup.el +=================================================================== +--- emacs-29.2.orig/lisp/loadup.el ++++ emacs-29.2/lisp/loadup.el +@@ -53,6 +53,13 @@ + (setq redisplay--inhibit-bidi t) + + (message "Dump mode: %s" dump-mode) ++;; Compensate for native-comp-eln-load-path being empty by Guix' default. ++(and (featurep 'native-compile) ++ (equal dump-mode "pdump") ++ (setq ++ native-comp-eln-load-path ++ (cons (expand-file-name "../native-lisp" invocation-directory) ++ native-comp-eln-load-path))) + + ;; Add subdirectories to the load-path for files that might get + ;; autoloaded when bootstrapping or running Emacs normally. +Index: emacs-29.2/lisp/Makefile.in +=================================================================== +--- emacs-29.2.orig/lisp/Makefile.in ++++ emacs-29.2/lisp/Makefile.in +@@ -110,6 +110,7 @@ MAIN_FIRST = ./emacs-lisp/eieio.el ./ema + + # Prevent any settings in the user environment causing problems. + unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++export NATIVE_COMP_BOGUS_DIRS = emacs-lisp:international:language:progmodes:term:textmodes:vc + + # The actual Emacs command run in the targets below. + emacs = '$(EMACS)' $(EMACSOPT) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 14:31:30 2024 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:31 +0000 Received: from localhost ([127.0.0.1]:47417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV4-0004Ed-Cb for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:30 -0500 Received: from mail-lf1-f46.google.com ([209.85.167.46]:61616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUy-0004D5-5I for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:20 -0500 Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-511831801f3so3586647e87.2 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852597; x=1708457397; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=C8Y/wZKEsMzUwMqeFVhNZOL8pxQtobx4eHVxn+jevRdMoZhPKBX7/heXhIzOLHKAvd C2C0A7wp7QMCYmSy1woG3dQNKWgDhSk6T+d/O81JTG9cBWx/WSwWfylVPiHgHaxfJJFQ DRyDpVJL1LO2oBsrs0RV6m8huEeyjV5e0iD0qeFEal7GuwLvEiLmbOky0lvSvcf31dLE DGUad3TVDOIz143ReOltN7K8uVa9WogRdWPoy2eIOAgZmxtnVwLD+FHDEEqIob8mXyAE tl02XFlZuGDvUFgrR/RdzE8LxVYGvtXJZ/iRzs9wP91w8h8uONedgHNaQyzQ9v6jjBoH 8y/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852597; x=1708457397; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=wq8UGX+tqxBGwwcKhKdU6/oNQ0FtUcGN5ZGRO/lH/d1jZqB0QeUYWyoD8wLzORGoHk FiN7sqtFFtt8nvioW3pYssF/SmWHF/yIREDIeKCyrEq7qCKaUhdCuXq2y0yXVqlwlJLS NAbl9IZfbRRMDCFDZabnys4dllGZtw1Km8dforW6gypLhp3PU9YqHUPN6WNntR0vv0Kr FHR5XoS5UyP/tC2QB/dvdRtc9zSfI74P0jUOwH+bryxys3HAuqM03H0HnGxD5i/lYnLK V7LAoo0PQ8HAYIpQTgLdZmCEtoxILEAQHciFcU5OPMNrqeBMTYKAkObd92Pq7IFHO0Ed 3jmA== X-Gm-Message-State: AOJu0YzKbDgyiE8HuQbKaDsrloyEZMVEI9+BVFzu+DJIekDkXjHYDdZH fZ2L8zkKkbwiG9KzhxrcMIcsUoe5L4aXfJL7peg05AK7dQUg4d0eSMgSK/Cv X-Google-Smtp-Source: AGHT+IHpkUHEKzI++HDjGzIhsb7S8UUd/t1u9aBw+dCwjLO40N1/1BLoXOBIvyUiQQ38YAjAQ2rrGg== X-Received: by 2002:ac2:530e:0:b0:511:53fa:b971 with SMTP id c14-20020ac2530e000000b0051153fab971mr369128lfh.9.1707852596640; Tue, 13 Feb 2024 11:29:56 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXwzJiJY0zrihVwV1RHZHl4WT2fJ+oBSTmGmgFp1C/V2Vm28vFvrl7aPof+4z0qE8ORW2iA1lv5N8XhYGDG6M1mgNgUae5SBmA66t0T36kmYiMfSiXGY+xD53r120Wk Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:56 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +0100 Subject: [PATCH v7 7/7] gnu: emacs-magit: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 19:57:10 2024 Received: (at 67260) by debbugs.gnu.org; 14 Feb 2024 00:57:11 +0000 Received: from localhost ([127.0.0.1]:48860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ra3aI-0007qH-LK for submit@debbugs.gnu.org; Tue, 13 Feb 2024 19:57:10 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:10395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ra3aE-0007pd-U7 for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 19:57:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1707872201; x=1708131401; bh=kWtI6iWJoMsOZiZo3KcUhfO4ZXcwVYK+SCc6gKT0TXU=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=NdsgdmD6cYBV9Ch02fUrDwGUKMNmG4N+KWwoDFqdCSqRFiLzuk1u4KMPn9ulj0zZw T/rohw/9IWCeX2uDzwqqmxa0zESrsNgNIYb2FIUDFNG5o300RrjP5cc01ZZxrpTfI1 qhcx71zx/yEnfogqqVIiOIPFgFiePnNJ3iBFkGV0hHn/WfeX3sI9aMEYP34jsqH9PG QITS+TW26IuaBYahauNiFcgsXYIkuExdTymOALEFoizbg5xNHLD9JJDfIsN7R1+9AE 1T3SROqQU+2UDn26sqWMKniuB8zNamlIYXbvFW8EP0mZ3yu2PoLIKgzaY+zzT6NZZd +9yB8g1KuMzhg== Date: Wed, 14 Feb 2024 00:56:35 +0000 To: bug#67260 <67260@debbugs.gnu.org> From: Suhail Subject: [bug#67260] [PATCH emacs-team v9*] Think ahead when compiling Message-ID: <87o7cjkgnb.fsf@gmail.com> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) The latest patch series (titled v7, but really v9) shows some improvement, however, there are still some issues. Specifically, functions from preloaded library uniquify are now correctly noted as being natively-compiled. The functions that were confirmed were uniquify-item-base and uniquify-item-p. However, functions from certain other preloaded libraries are still noted as being byte-compiled instead. At the very least this set includes backquote and eldoc. #+begin_src sh emacs --batch --eval (message "%s" (take 1 (split-string (substring-no-pr= operties (describe-function 'backquote-process)) "\n" t))) #+end_src #+RESULTS: : Type q in help window to delete it : (backquote-process is a byte-compiled Lisp function in `backquote.el'.) #+begin_src sh emacs --batch --eval (message "%s" (take 1 (split-string (substring-no-pr= operties (describe-function 'eldoc-mode)) "\n" t))) #+end_src #+RESULTS: : Type q in help window to delete it : (eldoc-mode is an interactive byte-compiled Lisp function in) --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 14 03:42:18 2024 Received: (at 67260) by debbugs.gnu.org; 14 Feb 2024 08:42:18 +0000 Received: from localhost ([127.0.0.1]:50231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raAqP-0002YO-KS for submit@debbugs.gnu.org; Wed, 14 Feb 2024 03:42:18 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]:17103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raAqL-0002Y9-6Q for 67260@debbugs.gnu.org; Wed, 14 Feb 2024 03:42:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1707900108; x=1708159308; bh=3jnP6r0jIyP2e5TB9ZfOJcJxfG2Rb7K6RREOi1rVARI=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=BN0nKTZ0T0ZUSMBEp1N0x+oOu8YyTMluJ8t/T2BXxkz87k584244K2Z8vhRcLzPZe N14DnxTjoEsZrL27sjijMQMlX9/5FLollaB9NuLL2YDENnOi4dMNEA2mKnKqZb9Ugx YvTzqNqdIS0f/As7BmIhgCOAUKN8+m4DSvzumg1i0a91LlDHE/NDplIm4lI8lsGlEd 8AW5osXFFkWto4BL83vqw9BcTkV9JcY5ZHWaTObP9fYiWios09j0UfmcJI0Ijvo8hL 9gyuwkzp2gltJjtPdDlg1FWJZ67X4EBA508qKPlLFXeBrPf3os1L04qnmUjzUgRJIj La8npVhGeGFWA== Date: Wed, 14 Feb 2024 08:41:30 +0000 To: bug#67260 <67260@debbugs.gnu.org> From: Suhail Subject: Re: [bug#67260] [PATCH emacs-team v9*] Test for AOT native-comp Message-ID: <87bk8jbfpu.fsf_-_@gmail.com> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) So I wrote some code to make it easier to report on the state of native-comp for some of the packages previously mentioned (the *.eln files for these packages reside under the "preloaded" directory in a non-Guix distribution). I'm including below both the contents of the script as well as the results. First the results. Assuming that the file test-native-comp-p--preloaded.el exists, evaluating the below: #+begin_src sh :results replace emacs -Q --batch \ -l path/to/test-native-comp-p--preloaded.el \ --eval "(princ (report/compilation-status/run))" #+end_src With a non-Guix Emacs results in: #+RESULTS: : [97/97] passed. Success! Whereas with the latest patch-series it results in 41 failing cases: #+RESULTS: #+begin_example [56/97] passed. 41 failing cases below: ((backquote-process . byte-compiled) (byte-run-strip-symbol-positions . byte-compiled) (cconv-convert . byte-compiled) (use-default-char-width-table . byte-compiled) (cl-generic-p . byte-compiled) (cl-struct-define . byte-compiled) (x-setup-function-keys . byte-compiled) (debug-early . byte-compiled) (easy-menu-item-present-p . byte-compiled) (eldoc-mode . byte-compiled) (elisp-mode-syntax-propertize . byte-compiled) (fill-region . byte-compiled) (fontset-plain-name . byte-compiled) (indian-compose-regexp . byte-compiled) (msdos-setup-keyboard . byte-compiled) (iso-transl-set-language . byte-compiled) (forward-sexp . byte-compiled) (lisp-string-in-doc-position-p . byte-compiled) (macroexp-compiling-p . byte-compiled) (map-y-or-n-p . byte-compiled) (egyptian-shape-grouping . byte-compiled) (convert-define-charset-argument . byte-compiled) (coding-system-change-eol-conversion . byte-compiled) (store-substring . byte-compiled) (advice-function-mapc . byte-compiled) (oclosure-type . byte-compiled) (forward-page . byte-compiled) (sentence-end . byte-compiled) (prog-context-menu . byte-compiled) (regexp-opt . byte-compiled) (read-multiple-choice . byte-compiled) (seq-first . byte-compiled) (hack-read-symbol-shorthands . byte-compiled) (syntax-propertize-multiline . byte-compiled) (tabulated-list-put-tag . byte-compiled) (text-mode . byte-compiled) (timer-activate . byte-compiled) (tty-color-desc . byte-compiled) (ucs-normalize-hfs-nfd-comp-p . byte-compiled) (vc-mode . byte-compiled) (x-handle-no-bitmap-icon . byte-compiled)) #+end_example The content of test-native-comp-p--preloaded.el are as follows: #+begin_src elisp :eval never (require 'help-fns) (defun report/compilation-status (fun &optional feature) "Report on the compilation status of function FUN. Optionally load FEATURE before reporting on compilation status." (when feature (require feature)) (let ((descstr (substring-no-properties (with-output-to-string (help-fns-function-description-header fun))))) (cons fun (cond ((string-search " native-compiled" descstr) 'native-compiled) ((string-search " byte-compiled" descstr) 'byte-compiled) (t descstr))))) ;; [[/usr/share/emacs/29.2/lisp]] (defvar report/compilation-status/cases/preloaded nil "Functions that ought to be natively-compiled.") (setq report/compilation-status/cases/preloaded '((abbrev-mode) (backquote-process) (mode-line-widen) (buffer-menu) ;; burmese (button-mode) (byte-run-strip-symbol-positions) (case-table-get-table) (cconv-convert) ;; cham (use-default-char-width-table) ;; chinese (cl-generic-p) (cl-struct-define) (x-setup-function-keys) (encode-composition-rule) ;; cp51932 (custom-declare-face) (minibuffer-prompt-properties--setter) ;; cus-start.el (custom-add-choice) ;; cyrillic ;; czech (debug-early) (display-table-slot disp-table) ;; disp-table.eln exists (dnd-open-file) (dos-mode25 dos-fns) ;; dos-fns.eln exists ;; dos-vars (find-file-text dos-w32) ;; dos-w32.eln exists (dynamic-setting-handle-config-changed-event) (easy-menu-item-present-p) ;; ediff-hook (eldoc-mode) (electric-indent-mode) (elisp-mode-syntax-propertize) ;; english (getenv) (epa-file-find-file-hook) ;; ethiopic ;; eucjp-ms ;; european (face-list) (find-file-noselect) (fill-region) ;; float-sup (font-lock-change-mode) (font-lock-add-keywords) (fontset-plain-name) (format-read) (frame-edges) (fringe-mode) ;; georgian ;; greek ;; haiku-win ;; hebrew (help-quick) (image-type) (indent-region) (indian-compose-regexp) ;; indonesian (msdos-setup-keyboard term/internal) ;; internal.eln exists (isearch-abort) (iso-transl-set-language) ;; japanese (jit-lock-mode) (jka-compr-build-file-regexp) (keymap-global-set) ;; khmer ;; korean ;; lao (forward-sexp) (lisp-string-in-doc-position-p) (ls-lisp-set-options ls-lisp) ;; ls-lisp.eln exists (macroexp-compiling-p) (map-y-or-n-p) (menu-find-file-existing) (completion-boundaries) (egyptian-shape-grouping) (mouse-double-click-time) (convert-define-charset-argument) (coding-system-change-eol-conversion) ;; mule-conf.eln (store-substring mule-util) ;; mule-util.eln exists (mouse-wheel-change-button) (advice-function-mapc) (comment-string-strip) ;; (ns-handle-nxopen term/ns-win) (obarray-make) (oclosure-type) (forward-page) (sentence-end) (show-paren-function) ;; (msdos-face-setup term/pc-win) (pgtk-dnd-init-frame pgtk-dnd) ;; pgtk-dnd.eln exists ;; (pgtk-drag-n-drop term/pgtk-win) ;; philippine (prog-context-menu) (regexp-opt) (get-register) (query-replace-descr) (rfn-eshadow-setup-minibuffer) (read-multiple-choice) ;; romanian (scroll-bar-scale) (gui-select-text) (seq-first) (hack-read-symbol-shorthands) (next-error-find-buffer) ;; sinhala ;; slovak (exit-splash-screen) (buffer-local-boundp) (syntax-propertize-multiline) (tab-bar-mode) (tabulated-list-put-tag) ;; tai-viet (text-mode) ;; thai ;; tibetan (timer-activate) (tool-bar-mode) (tooltip-mode) (tty-color-desc) (ucs-normalize-hfs-nfd-comp-p ucs-normalize) ;; ucs-normalize.eln= exists (uniquify-item-p) ;; utf-8-lang.eln (vc-mode) (emacs-version) ;; vietnamese ;; (w32-shell-name) ;; w32-vars.eln ;; (w32-handle-dropped-file 'term/w32-win) (define-widget) (window-right) (x-dnd-init-frame) (x-handle-no-bitmap-icon))) (defun report/compilation-status/run () "Run all cases and report those that aren't native-compiled." (let* ((results (mapcar (lambda (args) (apply #'report/compilation-stat= us args)) report/compilation-status/cases/preloaded)) (failing (seq-filter (lambda (x) (not (eq (cdr x) 'native-compil= ed))) results)) (numtotal (seq-length results)) (numfailing (seq-length failing)) (numpassing (- numtotal numfailing))) (concat (format "[%s/%s] passed." numpassing numtotal) (if failing (concat (format " %s failing cases below:\n\n" numfailin= g) (pp-to-string failing)) " Success!")))) #+end_src Hope this helps! --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:12:15 2024 Received: (at 67260) by debbugs.gnu.org; 16 Feb 2024 15:12:15 +0000 Received: from localhost ([127.0.0.1]:59894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razsr-0004Gw-MY for submit@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:15 -0500 Received: from mail-lj1-f179.google.com ([209.85.208.179]:49655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1razso-0004GX-4C for 67260@debbugs.gnu.org; Fri, 16 Feb 2024 10:12:12 -0500 Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2d11d17dddeso11776271fa.3 for <67260@debbugs.gnu.org>; Fri, 16 Feb 2024 07:11:50 -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=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=LB9CoTE5AQsiWXczYyUr2Opnnf0LhRgwzPYhvU1Fg1E=; b=ILaimqPKzMrS4CHrJSauBVLU9drCo7zMjcE5055yI3aIdA8OURlsK1MP5LfMJ2A3E5 2AjGEve4564Du8KzRxUJYqg2jBc1ojJUTYNN0eJBb0RheRarCjmZx70MeVsLJf933Z7d HjQhJ8WVNy9gwRsFfk/LdjQDg06pK9rkC/bIbr9ElfMo4pbJwjuiTYyRKiSobQ4hOLfr 8PRV15ifeEijy0fzQthTKK9DheYpAvNJ5W8q9cD69J1A+CYxANNr+z64qyDrnZJ2FM7H chp38ZIKagWGcbKawDzY6QOKTt99GuA8AOX/KOwbF9L9B/iDICEH+ZzDblH1TPpHSuIt qJGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708096245; x=1708701045; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LB9CoTE5AQsiWXczYyUr2Opnnf0LhRgwzPYhvU1Fg1E=; b=O5gJyYe+c67Neb8CzAEgQo/gsELrLN7uH2ICofmtYtXvRzhT9mHfWeZm082Fx76XEg yZgZaRc7tGEV3y/VXjcWYVa11iRlhMQ7lYVF2xGHuXVEBoxdPJiRujIUI6cf25AkQwjk dIYmmryy+63KP5lVZ4biiiEbpvi/U2u2/F0f73P2PSH4dYVEVsfDd3r9PJeehCVggUOY /ypA+yTpJ5fmLGn5GKlDujGPdgUL1a4XgmmO9Yod6joOEgwnP65WedSY0wWfemGecMLh BNFZZMT09J8x7htXKqUTPLNl+qd3IpWyyqfFuhSWbm7oZtzG5N73J3QkMEZ5XzpiYeQ4 Y63Q== X-Gm-Message-State: AOJu0YzwNscOUHwGd+onkATHFjRs95Huypmvq/MhxktLwrMzug1FB0JS B6l1vYPibdp2sw91Nw78v5FpPwfoni2PmZVCWcQLWRaCsKgrvOUx3kCuVWXw X-Google-Smtp-Source: AGHT+IG/WmMg3E51++8ilygfaCZBd0RKv+guADxSNJ1izavBHV8G6CWbp9pyMblxKISwvNC1mPr5IA== X-Received: by 2002:a2e:2416:0:b0:2d0:f265:4412 with SMTP id k22-20020a2e2416000000b002d0f2654412mr3722556ljk.2.1708096244506; Fri, 16 Feb 2024 07:10:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 07:10:43 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 16:09:58 +0100 Subject: [PATCH emacs-team v10 0/7] Preload most of the things MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) Am Mittwoch, dem 14.02.2024 um 08:41 +0000 schrieb Suhail: > So I wrote some code to make it easier to report on the state of > native-comp for some of the packages previously mentioned (the *.eln > files for these packages reside under the "preloaded" directory in a > non-Guix distribution). I'm including below both the contents of the > script as well as the results. > [...] > With a non-Guix Emacs results in: > > #+RESULTS: > : [97/97] passed. Success! > > Whereas with the latest patch-series it results in 41 failing cases: > > #+RESULTS: > #+begin_example > [56/97] passed.  41 failing cases below: With this series I get 94/97. The remaining three don't appear to be preloaded through the loadup script, so I have no idea how to catch them or whether it's even worth doing so. Liliana Marie Prikler (7): gnu: emacs: Wrap EMACSNATIVELOADPATH. gnu: emacs: Build trampolines. gnu: emacs: Don't hash file names in native compilation. gnu: emacs: Disable jit compilation. build-system: emacs: Compute relative file names. gnu: emacs-org: Fix native builds. gnu: emacs-magit: Fix native builds. gnu/local.mk | 2 + gnu/packages/emacs-xyz.scm | 10 +- gnu/packages/emacs.scm | 21 +- .../emacs-disable-jit-compilation.patch | 19 + .../emacs-native-comp-fix-filenames.patch | 329 ++++++++++++++++++ guix/build/emacs-utils.scm | 4 +- 6 files changed, 379 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/emacs-disable-jit-compilation.patch create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:12:18 2024 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 Subject: [PATCH emacs-team v10 2/7] gnu: emacs: Build trampolines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:12:18 2024 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 Subject: [PATCH emacs-team v10 4/7] gnu: emacs: Disable jit compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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"); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:12:19 2024 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 Subject: [PATCH emacs-team v10 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:12:20 2024 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 Subject: [PATCH emacs-team v10 3/7] gnu: emacs: Don't hash file names in native compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:12:20 2024 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 Subject: [PATCH emacs-team v10 6/7] gnu: emacs-org: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:12:20 2024 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 Subject: [PATCH emacs-team v10 7/7] gnu: emacs-magit: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 16 10:12:21 2024 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 Subject: [PATCH emacs-team v10 5/7] build-system: emacs: Compute relative file names. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 09:50:01 2024 Received: (at 67260) by debbugs.gnu.org; 17 Feb 2024 14:50:01 +0000 Received: from localhost ([127.0.0.1]:60582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbM0u-0001zd-3W for submit@debbugs.gnu.org; Sat, 17 Feb 2024 09:50:00 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]:57227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbM0r-0001zO-Ey for 67260@debbugs.gnu.org; Sat, 17 Feb 2024 09:49:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1708181370; x=1708440570; bh=X7F6DUguHA36WsuNcMSszbSunbef1LzRul3g6mIYsyU=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=fEa1BvAG31ZJTpAEPII3ZsJGDU9vuhSbAFi3zQlegWKqJoR+IjKCA+4T7I8SjSuG7 yajXFHdhrnxk6TyIR5Y1AWxu2D8djJgYa+DqCv3Aul2sQsse35V3gbO+RdTu3eh2Lb Zne7OpUBpdDxDGKkxqBb7MLqzvJ+y7TNmwUuOAb250SAzw8HghP8DpSvfombLwpqBQ MClzK2x10hqEYa5Gum73M80X45Q0YRnEcRXjmk2hicppkzI78FADuxjAipZ9Jti5i0 IPtRVsGyDb/9Ww3XDe3fgvYidv04M0W1AhzkwhVqtpyPIvOQ+9CpEVlBM4yuZQHb1C wQq320v+NIs/A== Date: Sat, 17 Feb 2024 14:49:22 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things Message-ID: <875xyndu36.fsf@bayesians.ca> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) Liliana Marie Prikler writes: > With this series I get 94/97. I was able to confirm that as well. > The remaining three Namely, the 'ucs-normalize, 'mule-util, and 'term/internal features. For each of these the .eln files exist, but the version that gets loaded in Guix is the byte-compiled one, unless some extra steps are taken. > ... don't appear to be preloaded through the loadup script, so I have > no idea how to catch them or whether it's even worth doing so. I dug into this a little deeper. It seems that by adjusting the load-path one is able to load the natively-compiled variants instead of the byte-compiled for these features. Oddly, this adjustment doesn't seem to be needed in non-Guix Emacs which may suggest the presence of a bug. I'm hoping you have some insight that explains this difference in behaviour. After modifying the previous test-native-comp-p--preloaded.el (in hindsight, the preloaded part may be a misnomer) with the below patch I got all the 97 cases passing. #+begin_src diff diff -u ./test-native-comp-p--preloaded.el ./test-native-comp-p--preloade= d.el --- ./test-native-comp-p--preloaded.el=092024-02-17 08:49:36.294930488 -0= 500 +++ ./test-native-comp-p--preloaded.el=092024-02-17 08:38:45.102839041 -0= 500 @@ -155,8 +155,50 @@ (x-dnd-init-frame) (x-handle-no-bitmap-icon))) =20 +(defun hack/tweak-load-path-in-guix () + "Tweak `load-path' to allow natively compiled versions to be loaded. + +If we ensure that the `load-path' entries for `term/internal', +`mule-util' and `ucs-normalize' exist and they occur before the +share/emacs//lisp entry then we are able to load +the natively compiled versions of these libraries. Of those +three, the entry for `term/internal' is missing whereas the +others currently occur after the share/emacs//lisp +entry. We remedy that here. + +Notably, in non-Guix Emacs this isn't needed. I.e., the fact +that the share/emacs//lisp entry precedes the +entries for `mule-util' and `ucs-normalize' is okay as is the +fact that the entry for `term/internal' is missing." + (when (getenv "GUIX_ENVIRONMENT") + (require 'find-func) + ;; first we'll add the missing entry for `term/internal' + (add-to-list 'load-path + (directory-file-name + (file-name-directory + (find-library-name (symbol-name 'term/internal)))) + ;; NOTE: we don't need to append; doing so simply to co= nfirm that + ;; it's only the relative position wrt the + ;; share/emacs//lisp entry that matters. + t) + ;; then we'll ensure that the entry for share/emacs//= lisp is at + ;; the end + (let* ((sitelisppath (format "/share/emacs/%s/lisp" + emacs-version)) + (pathsuffix (seq-filter + #'(lambda (x) + (string-suffix-p sitelisppath x)) + load-path)) + (pathprefix (seq-filter + #'(lambda (x) + (not + (string-suffix-p sitelisppath x))) + load-path))) + (setq load-path (append pathprefix pathsuffix))))) + (defun report/compilation-status/run () "Run all cases and report those that aren't native-compiled." + (hack/tweak-load-path-in-guix) (let* ((results (mapcar (lambda (args) (apply #'report/compilation-sta= tus args)) report/compilation-status/cases/preloaded)) (failing (seq-filter (lambda (x) (not (eq (cdr x) 'native-compi= led))) @@ -169,5 +211,5 @@ (if failing (concat (format " %s failing cases below:\n\n" numfaili= ng) (pp-to-string failing)) - " Success!")))) + " Success!\n")))) ;; guix/hacking/reviews/emacs-aot/test-native-comp-p/preloaded ends here Diff finished. Sat Feb 17 08:50:04 2024 #+end_src I'm also attaching, for reference, the updated test-native-comp-p--preloaded.el in its entirety. --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 10:16:51 2024 Received: (at 67260) by debbugs.gnu.org; 17 Feb 2024 15:16:51 +0000 Received: from localhost ([127.0.0.1]:33587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbMQs-0002wn-Md for submit@debbugs.gnu.org; Sat, 17 Feb 2024 10:16:51 -0500 Received: from mail-lj1-f181.google.com ([209.85.208.181]:56818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbMQo-0002wX-Pw for 67260@debbugs.gnu.org; Sat, 17 Feb 2024 10:16:50 -0500 Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2d220ad10b3so12924271fa.1 for <67260@debbugs.gnu.org>; Sat, 17 Feb 2024 07:16:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708182921; x=1708787721; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=iPiVAwCnHsECmIpDzF+bOM02R5t1SyA4jRn8lX4hSlo=; b=ZS5zB7cx0QV8GxH1o302iPJPXhyQMMCEKt4lEYMIMddcfmkKb5JT7rhe/sFhmtwnFp HnHnuWB52C1tDXsHpfWVZPNchiuUhvJahXBhgcbQEtXRKhJkOOBT1wCHLhUF8ajIQEOd Z7zin9ONPE4UIYkKYHpQ0wX+SV+OE3hUORdL5+/7mrdsRmcSBb735M+DkSLScvM7i+X/ ZP6PWAKWUPJpH5myRHapLP4b5RgnyyoTV9SGBom0KdNNhZDplaKSJEzs48LCs2Ki6umd mlXMijPEKIYDBp6KL3w3R/OZV+8FKNzSSvvRphoD7pEBS0fm555GfgTZGO6R1qJnPdKa gB/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708182921; x=1708787721; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iPiVAwCnHsECmIpDzF+bOM02R5t1SyA4jRn8lX4hSlo=; b=u3twC7ZzuyzzqT7ohXet8bkrFjJ2NQ25UfT8ggP4DHrEehGEXwOImDInvaIY5mitel KuhNHA8T63ExyzDpDvtVZnzZv0P5jM83hhonS79LWtsIasRfaS/3AE7lyDyl6IT2Gv2f 11f8hSYcmDZgSMqC27CTvVKCey2jzNnwqOUzFmw3udEB9FqwEgX9cSenNIVClhC19p2V 31bTlKoCqYBHELKQlb9GZfN/K6ziqZEKbmzjhfzS5x+UZps0MdvJG0D7v63kBaRLuHYm O8YnZhazlDUAj9YnyrdC58g0krOwUXypVK4Ipx7gm1g9vP7PhKY4ON62kMXZMaT/+5cw ft+A== X-Gm-Message-State: AOJu0Yyt97HXtIY08fADnkrqiYHz6XK6NaCRj+7APpqgAb+qtVZGCtrV 9h1fKCQjMrOLCoOCPhG5DdNGE/4mHJ7TpsiCws+AlEYIzIocDTnb X-Google-Smtp-Source: AGHT+IEwCwtYtyO1XGaDp1UoXEYXkqqopvrux+mLNIwwh9363i56TxpPK1NoeMkFV00wEGIvk+2Hlg== X-Received: by 2002:a2e:3501:0:b0:2d0:b3c3:d8d8 with SMTP id z1-20020a2e3501000000b002d0b3c3d8d8mr5061868ljz.43.1708182920378; Sat, 17 Feb 2024 07:15:20 -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 c2-20020a0564021f8200b0055fe5a611f2sm955714edc.20.2024.02.17.07.15.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 07:15:19 -0800 (PST) Message-ID: Subject: Re: [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things From: Liliana Marie Prikler To: Suhail Date: Sat, 17 Feb 2024 16:15:18 +0100 In-Reply-To: <875xyndu36.fsf@bayesians.ca> References: <875xyndu36.fsf@bayesians.ca> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) QW0gU2Ftc3RhZywgZGVtIDE3LjAyLjIwMjQgdW0gMTQ6NDkgKzAwMDAgc2NocmllYiBTdWhhaWw6 Cj4gTGlsaWFuYSBNYXJpZSBQcmlrbGVyIDxsaWxpYW5hLnByaWtsZXJAZ21haWwuY29tPiB3cml0 ZXM6Cj4gPiAuLi4gZG9uJ3QgYXBwZWFyIHRvIGJlIHByZWxvYWRlZCB0aHJvdWdoIHRoZSBsb2Fk dXAgc2NyaXB0LCBzbyBJCj4gPiBoYXZlIG5vIGlkZWEgaG93IHRvIGNhdGNoIHRoZW0gb3Igd2hl dGhlciBpdCdzIGV2ZW4gd29ydGggZG9pbmcgc28uCj4gCj4gSSBkdWcgaW50byB0aGlzIGEgbGl0 dGxlIGRlZXBlci7CoCBJdCBzZWVtcyB0aGF0IGJ5IGFkanVzdGluZyB0aGUKPiBsb2FkLXBhdGgg b25lIGlzIGFibGUgdG8gbG9hZCB0aGUgbmF0aXZlbHktY29tcGlsZWQgdmFyaWFudHMgaW5zdGVh ZAo+IG9mIHRoZSBieXRlLWNvbXBpbGVkIGZvciB0aGVzZSBmZWF0dXJlcy7CoCBPZGRseSwgdGhp cyBhZGp1c3RtZW50Cj4gZG9lc24ndCBzZWVtIHRvIGJlIG5lZWRlZCBpbiBub24tR3VpeCBFbWFj cyB3aGljaCBtYXkgc3VnZ2VzdCB0aGUKPiBwcmVzZW5jZSBvZiBhIGJ1Zy7CoCBJJ20gaG9waW5n IHlvdSBoYXZlIHNvbWUgaW5zaWdodCB0aGF0IGV4cGxhaW5zCj4gdGhpcyBkaWZmZXJlbmNlIGlu IGJlaGF2aW91ci4KV2UgYWRqdXN0IG91ciBsb2FkIHBhdGhzIHdpdGggZW52aXJvbm1lbnQgdmFy aWFibGVzLiAgSSBkb24ndCB0aGluayBvdXIKY2hvaWNlIG9mIHB1dHRpbmcgRW1hY3MgaXRzZWxm IGxhc3QgaXMgd3JvbmcgaGVyZS4KCj4gQWZ0ZXIgbW9kaWZ5aW5nIHRoZSBwcmV2aW91cyB0ZXN0 LW5hdGl2ZS1jb21wLXAtLXByZWxvYWRlZC5lbCAoaW4KPiBoaW5kc2lnaHQsIHRoZSBwcmVsb2Fk ZWQgcGFydCBtYXkgYmUgYSBtaXNub21lcikgd2l0aCB0aGUgYmVsb3cgcGF0Y2gKPiBJIGdvdCBh bGwgdGhlIDk3IGNhc2VzIHBhc3NpbmcuCj4gCj4gIytiZWdpbl9zcmMgZGlmZgo+IMKgIGRpZmYg LXUgLi90ZXN0LW5hdGl2ZS1jb21wLXAtLXByZWxvYWRlZC5lbCAuL3Rlc3QtbmF0aXZlLWNvbXAt cC0tCj4gcHJlbG9hZGVkLmVsCj4gwqAgLS0tIC4vdGVzdC1uYXRpdmUtY29tcC1wLS1wcmVsb2Fk ZWQuZWzCoMKgwqDCoMKgwqDCoMKgMjAyNC0wMi0xNwo+IDA4OjQ5OjM2LjI5NDkzMDQ4OCAtMDUw MAo+IMKgICsrKyAuL3Rlc3QtbmF0aXZlLWNvbXAtcC0tcHJlbG9hZGVkLmVswqDCoMKgwqDCoMKg wqDCoDIwMjQtMDItMTcKPiAwODozODo0NS4xMDI4MzkwNDEgLTA1MDAKPiDCoCBAQCAtMTU1LDgg KzE1NSw1MCBAQAo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgICh4LWRuZC1pbml0LWZyYW1lKQo+IMKg wqDCoMKgwqDCoMKgwqDCoMKgICh4LWhhbmRsZS1uby1iaXRtYXAtaWNvbikpKQo+IMKgCj4gwqAg KyhkZWZ1biBoYWNrL3R3ZWFrLWxvYWQtcGF0aC1pbi1ndWl4ICgpCj4gwqAgK8KgICJUd2VhayBg bG9hZC1wYXRoJyB0byBhbGxvdyBuYXRpdmVseSBjb21waWxlZCB2ZXJzaW9ucyB0byBiZQo+IGxv YWRlZC4KPiDCoCArCj4gwqAgK0lmIHdlIGVuc3VyZSB0aGF0IHRoZSBgbG9hZC1wYXRoJyBlbnRy aWVzIGZvciBgdGVybS9pbnRlcm5hbCcsCj4gwqAgK2BtdWxlLXV0aWwnIGFuZCBgdWNzLW5vcm1h bGl6ZScgZXhpc3QgYW5kIHRoZXkgb2NjdXIgYmVmb3JlIHRoZQo+IMKgICtzaGFyZS9lbWFjcy88 ZW1hY3MtdmVyc2lvbj4vbGlzcCBlbnRyeSB0aGVuIHdlIGFyZSBhYmxlIHRvIGxvYWQKPiDCoCAr dGhlIG5hdGl2ZWx5IGNvbXBpbGVkIHZlcnNpb25zIG9mIHRoZXNlIGxpYnJhcmllcy7CoCBPZiB0 aG9zZQo+IMKgICt0aHJlZSwgdGhlIGVudHJ5IGZvciBgdGVybS9pbnRlcm5hbCcgaXMgbWlzc2lu ZyB3aGVyZWFzIHRoZQo+IMKgICtvdGhlcnMgY3VycmVudGx5IG9jY3VyIGFmdGVyIHRoZSBzaGFy ZS9lbWFjcy88ZW1hY3MtdmVyc2lvbj4vbGlzcAo+IMKgICtlbnRyeS7CoCBXZSByZW1lZHkgdGhh dCBoZXJlLgo+IMKgICsKPiDCoCArTm90YWJseSwgaW4gbm9uLUd1aXggRW1hY3MgdGhpcyBpc24n dCBuZWVkZWQuwqAgSS5lLiwgdGhlIGZhY3QKPiDCoCArdGhhdCB0aGUgc2hhcmUvZW1hY3MvPGVt YWNzLXZlcnNpb24+L2xpc3AgZW50cnkgcHJlY2VkZXMgdGhlCj4gwqAgK2VudHJpZXMgZm9yIGBt dWxlLXV0aWwnIGFuZCBgdWNzLW5vcm1hbGl6ZScgaXMgb2theSBhcyBpcyB0aGUKPiDCoCArZmFj dCB0aGF0IHRoZSBlbnRyeSBmb3IgYHRlcm0vaW50ZXJuYWwnIGlzIG1pc3NpbmcuIgo+IMKgICvC oCAod2hlbiAoZ2V0ZW52ICJHVUlYX0VOVklST05NRU5UIikKPiDCoCArwqDCoMKgIChyZXF1aXJl ICdmaW5kLWZ1bmMpCj4gwqAgK8KgwqDCoCA7OyBmaXJzdCB3ZSdsbCBhZGQgdGhlIG1pc3Npbmcg ZW50cnkgZm9yIGB0ZXJtL2ludGVybmFsJwo+IMKgICvCoMKgwqAgKGFkZC10by1saXN0ICdsb2Fk LXBhdGgKPiDCoCArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRpcmVjdG9yeS1m aWxlLW5hbWUKPiDCoCArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZmlsZS1u YW1lLWRpcmVjdG9yeQo+IMKgICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGZpbmQtbGlicmFyeS1uYW1lIChzeW1ib2wtbmFtZQo+ICd0ZXJtL2ludGVybmFsKSkpKQo+IMKg ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBOT1RFOiB3ZSBkb24ndCBuZWVk IHRvIGFwcGVuZDsgZG9pbmcgc28gc2ltcGx5Cj4gdG8gY29uZmlybSB0aGF0Cj4gwqAgK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGl0J3Mgb25seSB0aGUgcmVsYXRpdmUgcG9z aXRpb24gd3J0IHRoZQo+IMKgICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBz aGFyZS9lbWFjcy88ZW1hY3MtdmVyc2lvbj4vbGlzcCBlbnRyeSB0aGF0Cj4gbWF0dGVycy4KPiDC oCArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgdCkKPiDCoCArwqDCoMKgIDs7IHRo ZW4gd2UnbGwgZW5zdXJlIHRoYXQgdGhlIGVudHJ5IGZvciBzaGFyZS9lbWFjcy88ZW1hY3MtCj4g dmVyc2lvbj4vbGlzcCBpcyBhdAo+IMKgICvCoMKgwqAgOzsgdGhlIGVuZAo+IMKgICvCoMKgwqAg KGxldCogKChzaXRlbGlzcHBhdGggKGZvcm1hdCAiL3NoYXJlL2VtYWNzLyVzL2xpc3AiCj4gwqAg K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgZW1hY3MtdmVyc2lvbikpCj4gwqAgK8KgwqDCoMKgwqDCoMKgwqDCoMKgIChwYXRo c3VmZml4IChzZXEtZmlsdGVyCj4gwqAgK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgIycobGFtYmRhICh4KQo+IMKgICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1zdWZmaXgtcCBzaXRlbGlz cHBhdGggeCkpCj4gwqAgK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgbG9hZC1wYXRoKSkKPiDCoCArwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHBhdGhwcmVmaXgg KHNlcS1maWx0ZXIKPiDCoCArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAjJyhsYW1iZGEgKHgpCj4gwqAgK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobm90Cj4gwqAgK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctc3VmZml4LXAgc2l0 ZWxpc3BwYXRoIHgpKSkKPiDCoCArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCBsb2FkLXBhdGgpKSkKPiDCoCArwqDCoMKgwqDCoCAoc2V0cSBsb2FkLXBhdGgg KGFwcGVuZCBwYXRocHJlZml4IHBhdGhzdWZmaXgpKSkpKQo+IMKgICsKPiDCoMKgIChkZWZ1biBy ZXBvcnQvY29tcGlsYXRpb24tc3RhdHVzL3J1biAoKQo+IMKgwqDCoMKgICJSdW4gYWxsIGNhc2Vz IGFuZCByZXBvcnQgdGhvc2UgdGhhdCBhcmVuJ3QgbmF0aXZlLWNvbXBpbGVkLiIKPiDCoCArwqAg KGhhY2svdHdlYWstbG9hZC1wYXRoLWluLWd1aXgpCj4gwqDCoMKgwqAgKGxldCogKChyZXN1bHRz IChtYXBjYXIgKGxhbWJkYSAoYXJncykgKGFwcGx5Cj4gIydyZXBvcnQvY29tcGlsYXRpb24tc3Rh dHVzIGFyZ3MpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIHJlcG9ydC9jb21waWxhdGlvbi0KPiBzdGF0dXMvY2FzZXMvcHJlbG9hZGVk KSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmYWlsaW5nIChzZXEtZmlsdGVyIChsYW1iZGEg KHgpIChub3QgKGVxIChjZHIgeCkKPiAnbmF0aXZlLWNvbXBpbGVkKSkpCj4gwqAgQEAgLTE2OSw1 ICsyMTEsNSBAQAo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGlmIGZhaWxpbmcKPiDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbmNhdCAoZm9ybWF0ICLCoCAl cyBmYWlsaW5nIGNhc2VzIGJlbG93OlxuXG4iCj4gbnVtZmFpbGluZykKPiDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChwcC10by1zdHJpbmcgZmFp bGluZykpCj4gwqAgLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIgU3VjY2VzcyEiKSkpKQo+ IMKgICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiIFN1Y2Nlc3MhXG4iKSkpKQo+IMKgwqAg OzsgZ3VpeC9oYWNraW5nL3Jldmlld3MvZW1hY3MtYW90L3Rlc3QtbmF0aXZlLWNvbXAtcC9wcmVs b2FkZWQKPiBlbmRzIGhlcmUKPiAKPiDCoCBEaWZmIGZpbmlzaGVkLsKgIFNhdCBGZWIgMTcgMDg6 NTA6MDQgMjAyNAo+ICMrZW5kX3NyYwpUaGlzIHdvbid0IHdvcmsgZm9yIHRoZSBjb21tb24gdXNl IGNhc2Ugb2YgcnVubmluZyBFbWFjcyBmcm9tIHRoZQpzdG9yZS4gIENhbiB5b3UgZG8gc29tZSBt b3JlIHJlc2VhcmNoIGFzIHRvIGhvdyB0aGlzIGNvbmZ1c2lvbiBjb21lcyB0bwpiZT8KCkNoZWVy cwoK From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 17 19:56:48 2024 Received: (at 67260) by debbugs.gnu.org; 18 Feb 2024 00:56:48 +0000 Received: from localhost ([127.0.0.1]:34015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbVU8-0001Go-0x for submit@debbugs.gnu.org; Sat, 17 Feb 2024 19:56:48 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]:32077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbVU5-0001GW-37 for 67260@debbugs.gnu.org; Sat, 17 Feb 2024 19:56:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1708217777; x=1708476977; bh=9bDCoNPxUAo0CFw1IXx7Lcluxet2VyEsMjZxkPG/kto=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=kS5lpWQceAK683McnQNNpGyxYiOCSdURSR9OS0XqAUDHbIY96RgP+cYIDIOkk9Zof y63mAq2UcKWFOaRl02ZUPbdtOpPmcASp22S/3zWOOJkQScD+X/+beaOY0ivkx0lnwn apGpnVI+wz8RISEl9j0F0S1hYwmRg5BwvGYS93fp59fn+PXOBmClenJqnbSjp6KZZr j/fKBLVyfwQma4uwvJAXTVCAgqV8fbL+gcsKggOmWbklmw+rgz5K3Qj1ySLlRtctwG jJct3yqjyOLXoekGk+bZg/DuOGEfhTJ3N2HlfiCMmfUSmthDtv3CoqmU73lr1weZmv logZXbK+yP7tw== Date: Sun, 18 Feb 2024 00:56:09 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things Message-ID: <87il2megkb.fsf@gmail.com> In-Reply-To: References: <875xyndu36.fsf@bayesians.ca> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) "Liliana Marie Prikler" writes: > I don't think our choice of putting Emacs itself last is wrong here. I'm not sure I understand. Just to be clear (please ignore in case this was already clear), in non-Guix Emacs the situation is as follows: 1. The directory where 'mule-util and 'ucs-normalize are located ("/usr/share/emacs/29.2/lisp/international") occurs in the load-path. And this entry occurs in the load-path AFTER "/usr/share/emacs/29.2/lisp". 2. The directory where 'term/internal is located ("/usr/share/emacs/29.2/lisp/international") does NOT occur in the load-path (and thus trivially doesn't occur before the "share/emacs/29.2/lisp" entry). After installing the v10 patch series, both 1 and 2 hold in Guix Emacs as well. However, Guix Emacs's behaviour when locating/loading natively-compiled versions of the above three features differs from the behaviour in non-Guix Emacs. Specifically, 1 and 2 above seem to pose a problem for only Guix Emacs and after remedying 1 and 2 above, as in the test script, the tests pass. All this to say, if by "putting Emacs itself last" you meant the change I made to the test script to make the tests pass, then while it may not be wrong, it also isn't correct either (seeing how it's not needed in non-Guix Emacs). My goal in sharing the patch was not to suggest a fix, but rather to possibly highlight something correlated with the cause of the problem we're observing. > Can you do some more research as to how this confusion comes to be? Since I have less familiarity with the internals of how Emacs locates natively-compiled features and loads them, I'm not sure where to begin. Do you have some concrete suggestions? What (I believe) we know: - Not all the .eln entries in the "preloaded" native-comp-eln-load-path directory in Emacs are actually loaded by default. This doesn't directly concern the issue, but it's to clarify that my use of the term "preloaded" in this thread is regarding the former and not the latter. - The issue of whether-natively-compiled-variants-are-loaded-or-not-depends-on-order-in-= load-path doesn't seem to affect packages that aren't built-in. Specifically, if the load-entry for a not-built-in package is put after the "share/emacs/29.2/lisp" entry, Guix Emacs is still able to load the natively-compiled variant. - It is unclear why other packages such 'log-edit, 'find-func etc. (built-in, but not loaded by default, having their load-entry after the "share/emacs/29.2/lisp" entry) aren't affected. --=20 Suhail This email is not an offer capable of acceptance, does not evidence an intention to enter into an agreement, has no operative effect until a definitive agreement is signed in writing by both parties, and that no party should act in reliance on the email or any representations of the sender until a definitive agreement is signed in writing by both parties. From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 18 04:21:27 2024 Received: (at 67260) by debbugs.gnu.org; 18 Feb 2024 09:21:28 +0000 Received: from localhost ([127.0.0.1]:34140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbdMV-0006QE-G3 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 04:21:27 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:51359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbdMT-0006Py-AP for 67260@debbugs.gnu.org; Sun, 18 Feb 2024 04:21:26 -0500 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-563d56ee65cso2418847a12.2 for <67260@debbugs.gnu.org>; Sun, 18 Feb 2024 01:21:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708247999; x=1708852799; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=29kGOGzl76posLWVPYVHGbTSSTYZxRy1/AuCD36Fggg=; b=eWxaNauYlBX0B/sGgXi22qm1I6razFyOQqHDRaHSE/+eCeKIXX+HNJYuzBc4Q9N2v3 R4EYEQ/HMue+QMuWdla9RifXFiFe51htWjMqQWeVBA3bW6MxyNFSR8bnngrJO2UzNHjv OWW2jsNnaBTUOPljXDlLx4P5gjqqbGbGF50P/p9DPk824GlVH7rxjIgai+a7vfV/vhC7 eOGjbESSiOib2RsId9FtdXeg0EIrEejBWzPU1VBcyJFDYQLj8+atc4Nwk9NdW5ohs/8e zuOUB2l0J12kWyrlc71AVZ2x86UiuI6rLERECyalc8CE/YiU8H9KUAO6f+rZt/0XsZ7V U22A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708247999; x=1708852799; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=29kGOGzl76posLWVPYVHGbTSSTYZxRy1/AuCD36Fggg=; b=CPY2MfCIySz4eWKubV4awvblnbSnf8dsmCVeWEof1ahPrChkRDJbcAwgnmQDR+Vz6l jq5pBkQtMTTKP5wbq5ZYA6nZtHgGhiNlndfY8zML6NEpPQCFoNEaPjrgdLHVWBAq1zNa yeZVJqoGMCWwm5aR0Hgqfw9dw3uLwGmGGhCpfICr2arVEuadk/rlzNRYpNmL6+mzD//D gtY7UAjy+93bK+iuGybqyNMfHQmiSPvkttIoEyVGbX86v55N/c5G0FVBSp8CZPgCMhJF K4lVbNGlv20iaD5omn5CHROcYOdByHiWDH79b1EQecMczuryc2DV6ddk97FPv8Vvz7YB NzPw== X-Gm-Message-State: AOJu0YxBmUDs0ER3qA8M/rXIMoVOMO4AdbQ6GbK0jvbg/5KfqZmEtx/w hwgnU5pKHw630699X9LFcDu0/gJXeMSfeS+119fnHzHnVS0bG8wP X-Google-Smtp-Source: AGHT+IHJnns1sApQE3YDV3w7r/uelgc5UcFoaay1JTEAUB2jX4hNgjfxg7p0d/wKbje9g8f6ea4q5g== X-Received: by 2002:a17:906:a38d:b0:a3e:5c65:9e27 with SMTP id k13-20020a170906a38d00b00a3e5c659e27mr913960ejz.56.1708247998888; Sun, 18 Feb 2024 01:19: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 u9-20020a170906780900b00a382bcd9943sm1769368ejm.145.2024.02.18.01.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 01:19:58 -0800 (PST) Message-ID: Subject: Re: [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things From: Liliana Marie Prikler To: Suhail Date: Sun, 18 Feb 2024 10:19:56 +0100 In-Reply-To: <87il2megkb.fsf@gmail.com> References: <875xyndu36.fsf@bayesians.ca> <87il2megkb.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) Am Sonntag, dem 18.02.2024 um 00:56 +0000 schrieb Suhail: > "Liliana Marie Prikler" writes: >=20 > > I don't think our choice of putting Emacs itself last is wrong > > here. >=20 > I'm not sure I understand.=C2=A0 Just to be clear (please ignore in case > this was already clear), in non-Guix Emacs the situation is as > follows: >=20 > 1. The directory where 'mule-util and 'ucs-normalize are located > =C2=A0=C2=A0 ("/usr/share/emacs/29.2/lisp/international") occurs in the l= oad- > path. > =C2=A0=C2=A0 And this entry occurs in the load-path AFTER > =C2=A0=C2=A0 "/usr/share/emacs/29.2/lisp". >=20 > 2. The directory where 'term/internal is located > =C2=A0=C2=A0 ("/usr/share/emacs/29.2/lisp/international") does NOT occur = in the > =C2=A0=C2=A0 load-path (and thus trivially doesn't occur before the > =C2=A0=C2=A0 "share/emacs/29.2/lisp" entry). Directory (2) is the same as directory (1). I think you meant $prefix/share/emacs/$emacs_version/lisp/term? =20 > After installing the v10 patch series, both 1 and 2 hold in Guix > Emacs as well.=C2=A0 However, Guix Emacs's behaviour when locating/loadin= g > natively-compiled versions of the above three features differs from > the behaviour in non-Guix Emacs.=C2=A0 Specifically, 1 and 2 above seem t= o > pose a problem for only Guix Emacs and after remedying 1 and 2 above, > as in the test script, the tests pass. >From my understanding (1) poses a problem because it messes up the way our patch computes relative file names. We could fix that with the newly introduced NATIVE_COMP_BOGUS_DIRS=E2=80=A6 hopefully. > All this to say, if by "putting Emacs itself last" you meant the > change I made to the test script to make the tests pass, then while > it may not be wrong, it also isn't correct either (seeing how it's > not needed in non-Guix Emacs).=C2=A0=C2=A0 The last (first) directory in EMACSLOADPATH (EMACSNATIVELOADPATH) is $prefix/share/emacs/$emacs_version/lisp ($prefix/lib/emacs/=E2=80=A6) on Gu= ix System. > My goal in sharing the patch was not to suggest a fix, but rather to > possibly highlight something correlated with the cause of the problem > we're observing. >=20 > > Can you do some more research as to how this confusion comes to be? >=20 > Since I have less familiarity with the internals of how Emacs locates > natively-compiled features and loads them, I'm not sure where to > begin. Do you have some concrete suggestions? > What (I believe) we know: >=20 > - Not all the .eln entries in the "preloaded"=20 > native-comp-eln-load-path directory in Emacs are actually loaded by > default.=C2=A0 This doesn't directly concern the issue, but it's to > clarify that my use of the term "preloaded" in this thread is > regarding the former and not the latter. Well, it does concern the issue in that locating such files becomes even harder. We need some place to put them and complicating these things for preloaded packages (for no real reason, might I add) is not fun. > - The issue of whether natively compiled variants are loaded or > depending on load-path order doesn't seem to affect packages that > aren't built-in.=C2=A0 Specifically, if the load-entry for a > not-built-in package is put after the "share/emacs/29.2/lisp" > entry, Guix Emacs is still able to load the natively-compiled > variant. Well, obviously not. Those are found under their packages and are probably still within a flat directory hierarchy. > - It is unclear why other packages such 'log-edit, 'find-func > =C2=A0 etc. (built-in, but not loaded by default, having their load-entry > =C2=A0 after the "share/emacs/29.2/lisp" entry) aren't affected. Update your script to account for them and we shall find out. Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 16:43:41 2024 Received: (at 67260) by debbugs.gnu.org; 19 Feb 2024 21:43:41 +0000 Received: from localhost ([127.0.0.1]:43676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBQK-0005iL-Bn for submit@debbugs.gnu.org; Mon, 19 Feb 2024 16:43:41 -0500 Received: from mail-40136.proton.ch ([185.70.40.136]:56905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcBQF-0005i3-84 for 67260@debbugs.gnu.org; Mon, 19 Feb 2024 16:43:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1708378986; x=1708638186; bh=7j+Ws8S2jSpowwIAZocaAA2L+dmzhF0u6xhHG2JNiU0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Ss657JFNeUnuGZm0dWFiulQxwoXz3bwt9j6A87eRK5l4YVtwdTDJa4zPVblCxFbw3 xTFsVCRixpwKQLHy0S6z0E10vRL93M0M++GRnHZZ3BZGQCgUz+INgBc658O9DCjM2n PKS3d3Vx7bTCcCMjMYAiTTRLoYqcrP9BU5QV5qzfqgtMJNmRmsRqGsmH+xTqEildDL jYUfvfGyNGu4B/sQGZrD1pPEyF7z6RNvE4uu3kQY4ht1eJW8sk6qqMSovO6Lb/Pl2O OLXaBfvZIStv5RmEFqLtX40Mi7pzJ5+iRShgIs0/AOOwHJM0XP0kVWflOOzvavqoYf PesZEDqPJpLTw== Date: Mon, 19 Feb 2024 21:42:59 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things Message-ID: <87ttm4uo4h.fsf@gmail.com> In-Reply-To: References: <875xyndu36.fsf@bayesians.ca> <87il2megkb.fsf@gmail.com> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) "Liliana Marie Prikler" writes: > Am Sonntag, dem 18.02.2024 um 00:56 +0000 schrieb Suhail: >> 1. The directory where 'mule-util and 'ucs-normalize are located >> =C2=A0=C2=A0 ("/usr/share/emacs/29.2/lisp/international") occurs in the = load- >> path. >> =C2=A0=C2=A0 And this entry occurs in the load-path AFTER >> =C2=A0=C2=A0 "/usr/share/emacs/29.2/lisp". >> >> 2. The directory where 'term/internal is located >> =C2=A0=C2=A0 ("/usr/share/emacs/29.2/lisp/international") does NOT occur= in the >> =C2=A0=C2=A0 load-path (and thus trivially doesn't occur before the >> =C2=A0=C2=A0 "share/emacs/29.2/lisp" entry). > Directory (2) is the same as directory (1). I think you meant > $prefix/share/emacs/$emacs_version/lisp/term? I did; thank you for catching that. >> - It is unclear why other packages such 'log-edit, 'find-func >> =C2=A0 etc. (built-in, but not loaded by default, having their load-entr= y >> =C2=A0 after the "share/emacs/29.2/lisp" entry) aren't affected. > Update your script to account for them and we shall find out. See the updated test script below. The above are accounted for in the third test case. The result of invoking the test script using the following invocation: #+begin_src sh :results replace emacs -Q --batch \ -l path/to/test-native-comp-p.el \ -f ert-run-tests-batch-and-exit 2>&1 #+end_src On non-Guix Emacs results in: #+begin_example Running 5 tests (2024-02-19 16:35:27-0500, selector =E2=80=98t=E2=80= =99) passed 1/5 01-natively-compiled-features-passing-as-of-v10 (0.000035= sec) passed 2/5 02-natively-compiled-features-failing-as-of-v10 (0.000016= sec) passed 3/5 03-some-features-in-later-load-path-entries-are-still-nat= ively-compiled (0.000012 sec) passed 4/5 04-load-path-order-should-not-determine-natively-compiled= -status (0.000015 sec) passed 5/5 05-there-exists-load-path-order-where-all-tests-pass (0.0= 00010 sec) Ran 5 tests, 5 results as expected, 0 unexpected (2024-02-19 16:35:27-050= 0, 0.000206 sec) #+end_example And with v10 patch series on Guix Emacs results in: #+begin_example Running 5 tests (2024-02-19 21:36:32+0000, selector `t') passed 1/5 01-natively-compiled-features-passing-as-of-v10 (0.000066= sec) failed 2/5 02-natively-compiled-features-failing-as-of-v10 (0.000034= sec) passed 3/5 03-some-features-in-later-load-path-entries-are-still-nat= ively-compiled (0.000013 sec) failed 4/5 04-load-path-order-should-not-determine-natively-compiled= -status (0.000034 sec) passed 5/5 05-there-exists-load-path-order-where-all-tests-pass (0.0= 00014 sec) Ran 5 tests, 5 results as expected, 0 unexpected (2024-02-19 21:36:32+000= 0, 0.000322 sec) 2 expected failures #+end_example The test script (test-native-comp-p.el): #+begin_src elisp :eval never ;;; Code: (require 'ert) (setq ert-quiet nil ert-batch-print-level 10 ert-batch-print-length 10 ert-batch-backtrace-line-length t) ;;; utils/ (eval-and-compile (require 'help-fns) (defmacro utils/report-compilation-status (fun &optional feature) "Report on the compilation status of function FUN. Optionally load FEATURE before reporting on compilation status." `(progn (eval-when-compile (when ',feature (require ',feature))) (let ((descstr (substring-no-properties (with-output-to-string (help-fns-function-description-header ',fun))))) (cons ',fun (cond ((string-search " native-compiled" descstr) 'native-compi= led) ;; ((string-search " autoloaded" descstr) descstr) ((string-search " byte-compiled" descstr) 'byte-compiled) (t descstr)))))) (defun utils/report-compilation-status/apply (fun &optional feature) "Invoke `utils/report-compilation-status' with FUN and FEATURE." (eval `(utils/report-compilation-status ,fun ,feature))) (require 'find-func) (defun utils/find-library-dir (feature) "Output directory where FEATURE resides." (directory-file-name (file-name-directory (find-library-name (symbol-name feature))))) (defun utils/report-failing-cases (cases) "From CASES, report failing tests. Test failure are those where `utils/report-compilation-status' doesn't report natively-compiled. CASES is a list where each element are ARGUMENTS for `utils/report-compilation-status'." (let ((results (mapcar (lambda (args) (apply #'utils/report-compilation-status/app= ly args)) cases))) (seq-filter (lambda (x) (not (eq (cdr x) 'native-compiled))) results)))) ;;; hack/ (eval-and-compile (defun hack/new-load-path-that-can-make-v10-test-failures-pass () "Return a list that can be used as the `load-path'. The returned list is assured to have the entry for share/emacs//lisp occur after the entry for lisp/international (corresponding to the `mule-util' and `ucs-normalize' failing test cases) and the entry for lisp/term (corresponding to the `term/internal' failing test case). If the `load-path' is set to the returned value, all tests pass in v10. Notably, in non-Guix Emacs this isn't needed. I.e., the fact that the share/emacs//lisp entry precedes the entries for `mule-util' and `ucs-normalize' is okay as is the fact that the entry for `term/internal' is missing." (eval-when-compile (require 'find-func)) ;; we'll ensure that the entry for share/emacs//lisp c= omes ;; after the lisp/international and lisp/term entries (let* ((new-load-path load-path) ;; add the missing entry for `term/internal' (_ (add-to-list 'new-load-path (utils/find-library-dir 'term/internal) ;; NOTE: we don't need to append; doing so sim= ply to confirm that ;; it's only the relative position wrt the ;; share/emacs//lisp entry that= matters. t)) (sitelisppath (format "/share/emacs/%s/lisp" emacs-version)) (pathsuffix (seq-filter (lambda (x) (string-suffix-p sitelisppath x)) new-load-path)) (pathprefix (seq-filter (lambda (x) (not (string-suffix-p sitelisppath x))) new-load-path))) (append pathprefix pathsuffix)))) ;;; cases/ ;; [[/usr/share/emacs/29.2/lisp]] (eval-when-compile (defvar cases/eln-in-preloaded-dir nil "Functions that ought to be natively-compiled.") (setq cases/eln-in-preloaded-dir '((abbrev-mode) (backquote-process) (mode-line-widen) (buffer-menu) ;; burmese (button-mode) (byte-run-strip-symbol-positions) (case-table-get-table) (cconv-convert) ;; cham (use-default-char-width-table) ;; chinese (cl-generic-p) (cl-struct-define) (x-setup-function-keys) (encode-composition-rule) ;; cp51932 (custom-declare-face) (minibuffer-prompt-properties--setter) ;; cus-start.el (custom-add-choice) ;; cyrillic ;; czech (debug-early) (display-table-slot disp-table) ;; disp-table.eln exists (dnd-open-file) (dos-mode25 dos-fns) ;; dos-fns.eln exists ;; dos-vars (find-file-text dos-w32) ;; dos-w32.eln exists (dynamic-setting-handle-config-changed-event) (easy-menu-item-present-p) ;; ediff-hook (eldoc-mode) (electric-indent-mode) (elisp-mode-syntax-propertize) ;; english (getenv) (epa-file-find-file-hook) ;; ethiopic ;; eucjp-ms ;; european (face-list) (find-file-noselect) (fill-region) ;; float-sup (font-lock-change-mode) (font-lock-add-keywords) (fontset-plain-name) (format-read) (frame-edges) (fringe-mode) ;; georgian ;; greek ;; haiku-win ;; hebrew (help-quick) (image-type) (indent-region) (indian-compose-regexp) ;; indonesian (msdos-setup-keyboard term/internal) ;; internal.eln exists (isearch-abort) (iso-transl-set-language) ;; japanese (jit-lock-mode) (jka-compr-build-file-regexp) (keymap-global-set) ;; khmer ;; korean ;; lao (forward-sexp) (lisp-string-in-doc-position-p) (ls-lisp-set-options ls-lisp) ;; ls-lisp.eln exists (macroexp-compiling-p) (map-y-or-n-p) (menu-find-file-existing) (completion-boundaries) (egyptian-shape-grouping) (mouse-double-click-time) (convert-define-charset-argument) (coding-system-change-eol-conversion) ;; mule-conf.eln (store-substring mule-util) ;; mule-util.eln exists (mouse-wheel-change-button) (advice-function-mapc) (comment-string-strip) ;; (ns-handle-nxopen term/ns-win) (obarray-make) (oclosure-type) (forward-page) (sentence-end) (show-paren-function) ;; (msdos-face-setup term/pc-win) (pgtk-dnd-init-frame pgtk-dnd) ;; pgtk-dnd.eln exists ;; (pgtk-drag-n-drop term/pgtk-win) ;; philippine (prog-context-menu) (regexp-opt) (get-register) (query-replace-descr) (rfn-eshadow-setup-minibuffer) (read-multiple-choice) ;; romanian (scroll-bar-scale) (gui-select-text) (seq-first) (hack-read-symbol-shorthands) (next-error-find-buffer) ;; sinhala ;; slovak (exit-splash-screen) (buffer-local-boundp) (syntax-propertize-multiline) (tab-bar-mode) (tabulated-list-put-tag) ;; tai-viet (text-mode) ;; thai ;; tibetan (timer-activate) (tool-bar-mode) (tooltip-mode) (tty-color-desc) (ucs-normalize-hfs-nfd-comp-p ucs-normalize) ;; ucs-normalize.e= ln exists (uniquify-item-p) ;; utf-8-lang.eln (vc-mode) (emacs-version) ;; vietnamese ;; (w32-shell-name) ;; w32-vars.eln ;; (w32-handle-dropped-file 'term/w32-win) (define-widget) (window-right) (x-dnd-init-frame) (x-handle-no-bitmap-icon)))) ;;; ERT tests (ert-deftest 01-natively-compiled-features-passing-as-of-v10 () "The 94 cases which pass for v10 patch series. These cases are taken from .eln files that are located in the preloaded directory for non-Guix Emacs." (eval-when-compile (let ((cases (seq-filter (lambda (x) (not (memq (cadr x) '(mule-util term/inter= nal ucs-normalize)))) cases/eln-in-preloaded-dir))) (should-not (utils/report-failing-cases cases))))) (ert-deftest 02-natively-compiled-features-failing-as-of-v10 () "The 3 cases which fail for v10 patch series on Guix Emacs. These cases are taken from .eln files that are located in the preloaded directory for non-Guix Emacs." :expected-result (if (getenv "GUIX_ENVIRONMENT") :failed :passed) (should-not (eval-when-compile (let ((cases (seq-filter (lambda (x) (memq (cadr x) '(mule-util term/internal = ucs-normalize))) cases/eln-in-preloaded-dir))) (utils/report-failing-cases cases))))) (ert-deftest 03-some-features-in-later-load-path-entries-are-still-native= ly-compiled () "These cases pass as of v10 of the patch. These cases share the fact that their directory entries occur in the `load-path' after the $prefix/share/emacs/$emacs_version/lisp entry. This is something these cases have in common with the three cases that are known to fail, however, unlike them these succeed (i.e., natively-compiled variants are loaded)." (eval-when-compile (let* ((cases '((cl-position cl-seq) (find-library-name find-func) (log-edit log-edit))) (failing (utils/report-failing-cases cases)) (features-loadpath-entries (mapcar #'utils/find-library-dir (mapcar #'cadr cases))) (features-entry-pos (mapcar (lambda (x) (cl-position (utils/find-library-dir (cadr x= )) load-path :test #'equal)) cases)) (share-emacs-lisp-entry-pos (cl-position "/share/emacs/29.2/li= sp" load-path :test #'string-suffix= -p))) (should-not failing) (should-not (seq-filter (lambda (x) (< x share-emacs-lisp-entry-pos= )) features-entry-pos))))) (ert-deftest 04-load-path-order-should-not-determine-natively-compiled-st= atus () "This seems like an invariant that would be useful to have. It is unclear if this is guaranteed by upstream Emacs, but observations seem consistent with it." :expected-result (if (getenv "GUIX_ENVIRONMENT") :failed :passed) (eval-when-compile (defvar original-load-path load-path)) (let ((failures-prior-to-load-path-shuffle (eval-when-compile (utils/report-failing-cases cases/eln-in-preloaded-dir))) (failures-post-load-path-shuffle (eval-when-compile (progn (setq load-path (hack/new-load-path-that-can-make-v10-test-failures-pa= ss)) (dolist (item cases/eln-in-preloaded-dir) (when (cadr item) (unload-feature (cadr item)))) (utils/report-failing-cases cases/eln-in-preloaded-dir))))) (should (equal failures-prior-to-load-path-shuffle failures-post-load-path-shuffle)))) (ert-deftest 05-there-exists-load-path-order-where-all-tests-pass () "Proof witness that the v10 failing cases relate to load-path ordering.= " (should-not (eval-when-compile (when (and (boundp 'original-load-path) original-load-pat= h) (setq load-path original-load-path) (dolist (item cases/eln-in-preloaded-dir) (when (cadr item) (unload-feature (cadr item))))) (defvar original-load-path load-path) (setq load-path (hack/new-load-path-that-can-make-v10-test-failures= -pass)) (utils/report-failing-cases cases/eln-in-preloaded-dir)))= ) ;;; test-native-comp-p.el ends here #+end_src --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 20 12:52:39 2024 Received: (at 67260) by debbugs.gnu.org; 20 Feb 2024 17:52:39 +0000 Received: from localhost ([127.0.0.1]:46497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcUIH-000884-OS for submit@debbugs.gnu.org; Tue, 20 Feb 2024 12:52:39 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:42444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcUIB-00087W-3M for 67260@debbugs.gnu.org; Tue, 20 Feb 2024 12:52:34 -0500 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-561587ce966so11585996a12.1 for <67260@debbugs.gnu.org>; Tue, 20 Feb 2024 09:52:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708451463; x=1709056263; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=N1KKWsv12dSLQj58PkeUIZV8UHE59YAs7P8QNq3jEWE=; b=kmG/A+R16NGc6BKxJ/T92+7yPotVkTzeLft6gl157wSowMF6fYSlqN+KwSfx5beQvV h8i2azk82xZdhPhUdYG5u9vsnZz3b7SDpFiv+agyxX5tiC+C2TySNG/hafuSKu19QTjy dIKuoQZuNx93S+2VwwjIkyG40L34HRsRF1Xz3TVbC9kDyGOPwLeeKS3vNhEbAZdIrf9E mMgZYY9Y0gPaPseY+jlA+O8sUOn0diHZrNNhVGFymKK8KWRJWuvXZ52fBCN0Iic2C89r 8IKtlMPGrzmJ+0uIKcdlKECaGVDTE3UGXx3em0SCanb53kr7hAPbDxn0b07IXfHxk2HI F4FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708451463; x=1709056263; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=N1KKWsv12dSLQj58PkeUIZV8UHE59YAs7P8QNq3jEWE=; b=qiHBknimefu7Cmft2Qjax6nHy1BEGXMyt5kI1I+bLViluOgMQ3OkWk8/lXFMjjCHKI U+QT5Rt0k1uh7YQswEreyRyoqmkbbhT/jSZOYI6w16PX9e/0O5S25Glif7wEA8tFI6fG Vr1bUbzbDbXPkYvwcsMTcDo0xLgFAKpUmvE0KodbdAKrot+xAXSJTAJaB0NAgTNSlYRG vepC23c5a3LFeXSms8hLQ1V51AOOmhNbq8MC7cGjZHVGXwuPLbz5kVWPbnrY0qribsjK Rua2+vJyUWfkCmcoRpdr0UHAfD3sWThpcrA85mEhp4tb61bT8PzrBl/yydt07r/6YikK A1RQ== X-Gm-Message-State: AOJu0YwsHM+qXRq4YWabiOAYE1to9mVBsnIC/jkHHzZlOh/MsJdr7frr AtYPLH/t8XQ1Y4tKLajKrSdD81Bf2bKlH3qYHxk4dSUUcFDFSSQ/ X-Google-Smtp-Source: AGHT+IGaH33bJYp/GCFRZ4a0B6N5oy/H05AIUfViizo0szCHmAowYy4mgQnUzw13/AxskeQtSYgl/w== X-Received: by 2002:aa7:c994:0:b0:564:db21:e97f with SMTP id c20-20020aa7c994000000b00564db21e97fmr1384373edt.19.1708451463061; Tue, 20 Feb 2024 09:51:03 -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 i16-20020a0564020f1000b0056411b3fc4bsm3842541eda.30.2024.02.20.09.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 09:51:02 -0800 (PST) Message-ID: <76a4267be5c73908490e5d70bf22d109aca395cb.camel@gmail.com> Subject: Re: [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things From: Liliana Marie Prikler To: Suhail Date: Tue, 20 Feb 2024 18:51:01 +0100 In-Reply-To: <87ttm4uo4h.fsf@gmail.com> References: <875xyndu36.fsf@bayesians.ca> <87il2megkb.fsf@gmail.com> <87ttm4uo4h.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) QW0gTW9udGFnLCBkZW0gMTkuMDIuMjAyNCB1bSAyMTo0MiArMDAwMCBzY2hyaWViIFN1aGFpbDoK PiAiTGlsaWFuYSBNYXJpZSBQcmlrbGVyIiA8bGlsaWFuYS5wcmlrbGVyQGdtYWlsLmNvbT4gd3Jp dGVzOgo+IAo+ID4gQW0gU29ubnRhZywgZGVtIDE4LjAyLjIwMjQgdW0gMDA6NTYgKzAwMDAgc2No cmllYiBTdWhhaWw6Cj4gPiA+IDEuIFRoZSBkaXJlY3Rvcnkgd2hlcmUgJ211bGUtdXRpbCBhbmQg J3Vjcy1ub3JtYWxpemUgYXJlIGxvY2F0ZWQKPiA+ID4gwqDCoCAoIi91c3Ivc2hhcmUvZW1hY3Mv MjkuMi9saXNwL2ludGVybmF0aW9uYWwiKSBvY2N1cnMgaW4gdGhlCj4gPiA+IGxvYWQtCj4gPiA+ IHBhdGguCj4gPiA+IMKgwqAgQW5kIHRoaXMgZW50cnkgb2NjdXJzIGluIHRoZSBsb2FkLXBhdGgg QUZURVIKPiA+ID4gwqDCoCAiL3Vzci9zaGFyZS9lbWFjcy8yOS4yL2xpc3AiLgo+ID4gPiAKPiA+ ID4gMi4gVGhlIGRpcmVjdG9yeSB3aGVyZSAndGVybS9pbnRlcm5hbCBpcyBsb2NhdGVkCj4gPiA+ IMKgwqAgKCIvdXNyL3NoYXJlL2VtYWNzLzI5LjIvbGlzcC9pbnRlcm5hdGlvbmFsIikgZG9lcyBO T1Qgb2NjdXIgaW4KPiA+ID4gdGhlCj4gPiA+IMKgwqAgbG9hZC1wYXRoIChhbmQgdGh1cyB0cml2 aWFsbHkgZG9lc24ndCBvY2N1ciBiZWZvcmUgdGhlCj4gPiA+IMKgwqAgInNoYXJlL2VtYWNzLzI5 LjIvbGlzcCIgZW50cnkpLgo+ID4gRGlyZWN0b3J5ICgyKSBpcyB0aGUgc2FtZSBhcyBkaXJlY3Rv cnkgKDEpLsKgIEkgdGhpbmsgeW91IG1lYW50Cj4gPiAkcHJlZml4L3NoYXJlL2VtYWNzLyRlbWFj c192ZXJzaW9uL2xpc3AvdGVybT8KPiAKPiBJIGRpZDsgdGhhbmsgeW91IGZvciBjYXRjaGluZyB0 aGF0Lgo+IAo+ID4gPiAtIEl0IGlzIHVuY2xlYXIgd2h5IG90aGVyIHBhY2thZ2VzIHN1Y2ggJ2xv Zy1lZGl0LCAnZmluZC1mdW5jCj4gPiA+IMKgIGV0Yy4gKGJ1aWx0LWluLCBidXQgbm90IGxvYWRl ZCBieSBkZWZhdWx0LCBoYXZpbmcgdGhlaXIgbG9hZC0KPiA+ID4gZW50cnkKPiA+ID4gwqAgYWZ0 ZXIgdGhlICJzaGFyZS9lbWFjcy8yOS4yL2xpc3AiIGVudHJ5KSBhcmVuJ3QgYWZmZWN0ZWQuCj4g PiBVcGRhdGUgeW91ciBzY3JpcHQgdG8gYWNjb3VudCBmb3IgdGhlbSBhbmQgd2Ugc2hhbGwgZmlu ZCBvdXQuCj4gCj4gU2VlIHRoZSB1cGRhdGVkIHRlc3Qgc2NyaXB0IGJlbG93LsKgIFRoZSBhYm92 ZSBhcmUgYWNjb3VudGVkIGZvciBpbgo+IHRoZSB0aGlyZCB0ZXN0IGNhc2UuCldlIHN0aWxsIG9u bHkgaGF2ZSA5NyB0ZXN0cyBzcXVhc2hlZCB0byA1IGNhc2VzIElJVUMuICBUaGVyZSdzIHNvbWUK MTAwMCBmaWxlcyBpbiB0aGUgbmF0aXZlLWxpc3AgZGlyZWN0b3J5LiAgV2hhdCBJIHdhcyBhY3R1 YWxseSBob3BpbmcKZm9yIGlzIG1vcmUgb3IgbGVzcyBvbmUgdGVzdCBwZXIgZmVhdHVyZS4KCj4g VGhlIHJlc3VsdCBvZiBpbnZva2luZyB0aGUgdGVzdCBzY3JpcHQgdXNpbmcgdGhlIGZvbGxvd2lu Zwo+IGludm9jYXRpb246Cj4gCj4gIytiZWdpbl9zcmMgc2ggOnJlc3VsdHMgcmVwbGFjZQo+IMKg IGVtYWNzIC1RIC0tYmF0Y2ggXAo+IMKgwqDCoMKgwqDCoMKgIC1sIHBhdGgvdG8vdGVzdC1uYXRp dmUtY29tcC1wLmVsIFwKPiDCoMKgwqDCoMKgwqDCoCAtZiBlcnQtcnVuLXRlc3RzLWJhdGNoLWFu ZC1leGl0IDI+JjEKPiAjK2VuZF9zcmMKPiAKPiBPbiBub24tR3VpeCBFbWFjcyByZXN1bHRzIGlu Ogo+IAo+ICMrYmVnaW5fZXhhbXBsZQo+IMKgIFJ1bm5pbmcgNSB0ZXN0cyAoMjAyNC0wMi0xOSAx NjozNToyNy0wNTAwLCBzZWxlY3RvciDigJh04oCZKQo+IMKgwqDCoMKgIHBhc3NlZMKgIDEvNcKg IDAxLW5hdGl2ZWx5LWNvbXBpbGVkLWZlYXR1cmVzLXBhc3NpbmctYXMtb2YtdjEwCj4gKDAuMDAw MDM1IHNlYykKPiDCoMKgwqDCoCBwYXNzZWTCoCAyLzXCoCAwMi1uYXRpdmVseS1jb21waWxlZC1m ZWF0dXJlcy1mYWlsaW5nLWFzLW9mLXYxMAo+ICgwLjAwMDAxNiBzZWMpCj4gwqDCoMKgwqAgcGFz c2VkwqAgMy81wqAgMDMtc29tZS1mZWF0dXJlcy1pbi1sYXRlci1sb2FkLXBhdGgtZW50cmllcy1h cmUtCj4gc3RpbGwtbmF0aXZlbHktY29tcGlsZWQgKDAuMDAwMDEyIHNlYykKPiDCoMKgwqDCoCBw YXNzZWTCoCA0LzXCoCAwNC1sb2FkLXBhdGgtb3JkZXItc2hvdWxkLW5vdC1kZXRlcm1pbmUtbmF0 aXZlbHktCj4gY29tcGlsZWQtc3RhdHVzICgwLjAwMDAxNSBzZWMpCj4gwqDCoMKgwqAgcGFzc2Vk wqAgNS81wqAgMDUtdGhlcmUtZXhpc3RzLWxvYWQtcGF0aC1vcmRlci13aGVyZS1hbGwtdGVzdHMt Cj4gcGFzcyAoMC4wMDAwMTAgc2VjKQo+IAo+IMKgIFJhbiA1IHRlc3RzLCA1IHJlc3VsdHMgYXMg ZXhwZWN0ZWQsIDAgdW5leHBlY3RlZCAoMjAyNC0wMi0xOQo+IDE2OjM1OjI3LTA1MDAsIDAuMDAw MjA2IHNlYykKPiAjK2VuZF9leGFtcGxlCj4gCj4gQW5kIHdpdGggdjEwIHBhdGNoIHNlcmllcyBv biBHdWl4IEVtYWNzIHJlc3VsdHMgaW46Cj4gCj4gIytiZWdpbl9leGFtcGxlCj4gwqAgUnVubmlu ZyA1IHRlc3RzICgyMDI0LTAyLTE5IDIxOjM2OjMyKzAwMDAsIHNlbGVjdG9yIGB0JykKPiDCoMKg wqDCoCBwYXNzZWTCoCAxLzXCoCAwMS1uYXRpdmVseS1jb21waWxlZC1mZWF0dXJlcy1wYXNzaW5n LWFzLW9mLXYxMAo+ICgwLjAwMDA2NiBzZWMpCj4gwqDCoMKgwqAgZmFpbGVkwqAgMi81wqAgMDIt bmF0aXZlbHktY29tcGlsZWQtZmVhdHVyZXMtZmFpbGluZy1hcy1vZi12MTAKPiAoMC4wMDAwMzQg c2VjKQo+IMKgwqDCoMKgIHBhc3NlZMKgIDMvNcKgIDAzLXNvbWUtZmVhdHVyZXMtaW4tbGF0ZXIt bG9hZC1wYXRoLWVudHJpZXMtYXJlLQo+IHN0aWxsLW5hdGl2ZWx5LWNvbXBpbGVkICgwLjAwMDAx MyBzZWMpCj4gwqDCoMKgwqAgZmFpbGVkwqAgNC81wqAgMDQtbG9hZC1wYXRoLW9yZGVyLXNob3Vs ZC1ub3QtZGV0ZXJtaW5lLW5hdGl2ZWx5LQo+IGNvbXBpbGVkLXN0YXR1cyAoMC4wMDAwMzQgc2Vj KQo+IMKgwqDCoMKgIHBhc3NlZMKgIDUvNcKgIDA1LXRoZXJlLWV4aXN0cy1sb2FkLXBhdGgtb3Jk ZXItd2hlcmUtYWxsLXRlc3RzLQo+IHBhc3MgKDAuMDAwMDE0IHNlYykKPiAKPiDCoCBSYW4gNSB0 ZXN0cywgNSByZXN1bHRzIGFzIGV4cGVjdGVkLCAwIHVuZXhwZWN0ZWQgKDIwMjQtMDItMTkKPiAy MTozNjozMiswMDAwLCAwLjAwMDMyMiBzZWMpCj4gwqAgMiBleHBlY3RlZCBmYWlsdXJlcwo+ICMr ZW5kX2V4YW1wbGUKPiAKPiBUaGUgdGVzdCBzY3JpcHQgKHRlc3QtbmF0aXZlLWNvbXAtcC5lbCk6 Cj4gCj4gIytiZWdpbl9zcmMgZWxpc3AgOmV2YWwgbmV2ZXIKPiDCoCA7OzsgQ29kZToKPiDCoCAo cmVxdWlyZSAnZXJ0KQo+IMKgIChzZXRxIGVydC1xdWlldCBuaWwKPiDCoMKgwqDCoMKgwqDCoCBl cnQtYmF0Y2gtcHJpbnQtbGV2ZWwgMTAKPiDCoMKgwqDCoMKgwqDCoCBlcnQtYmF0Y2gtcHJpbnQt bGVuZ3RoIDEwCj4gwqDCoMKgwqDCoMKgwqAgZXJ0LWJhdGNoLWJhY2t0cmFjZS1saW5lLWxlbmd0 aCB0KQo+IAo+IMKgIDs7OyB1dGlscy8KPiDCoCAoZXZhbC1hbmQtY29tcGlsZQo+IMKgwqDCoCAo cmVxdWlyZSAnaGVscC1mbnMpCj4gwqDCoMKgIChkZWZtYWNybyB1dGlscy9yZXBvcnQtY29tcGls YXRpb24tc3RhdHVzIChmdW4gJm9wdGlvbmFsIGZlYXR1cmUpCj4gwqDCoMKgwqDCoCAiUmVwb3J0 IG9uIHRoZSBjb21waWxhdGlvbiBzdGF0dXMgb2YgZnVuY3Rpb24gRlVOLgo+IMKgIE9wdGlvbmFs bHkgbG9hZCBGRUFUVVJFIGJlZm9yZSByZXBvcnRpbmcgb24gY29tcGlsYXRpb24gc3RhdHVzLiIK PiDCoMKgwqDCoMKgIGAocHJvZ24KPiDCoMKgwqDCoMKgwqDCoMKgIChldmFsLXdoZW4tY29tcGls ZQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgICh3aGVuICcsZmVhdHVyZQo+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAocmVxdWlyZSAnLGZlYXR1cmUpKSkKPiDCoMKgwqDCoMKgwqDCoMKgIChsZXQg KChkZXNjc3RyIChzdWJzdHJpbmctbm8tcHJvcGVydGllcwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAod2l0aC1vdXRwdXQtdG8tc3RyaW5nCj4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoaGVscC1m bnMtZnVuY3Rpb24tZGVzY3JpcHRpb24taGVhZGVyCj4gJyxmdW4pKSkpKQo+IMKgwqDCoMKgwqDC oMKgwqDCoMKgIChjb25zICcsZnVuCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGNvbmQKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoc3RyaW5nLXNlYXJj aCAiIG5hdGl2ZS1jb21waWxlZCIgZGVzY3N0cikKPiAnbmF0aXZlLWNvbXBpbGVkKQo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgKChzdHJpbmctc2VhcmNoICIgYXV0b2xv YWRlZCIgZGVzY3N0cikgZGVzY3N0cikKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgICgoc3RyaW5nLXNlYXJjaCAiIGJ5dGUtY29tcGlsZWQiIGRlc2NzdHIpICdieXRlLQo+IGNv bXBpbGVkKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHQgZGVzY3N0cikp KSkpKQo+IAo+IMKgwqDCoCAoZGVmdW4gdXRpbHMvcmVwb3J0LWNvbXBpbGF0aW9uLXN0YXR1cy9h cHBseSAoZnVuICZvcHRpb25hbAo+IGZlYXR1cmUpCj4gwqDCoMKgwqDCoCAiSW52b2tlIGB1dGls cy9yZXBvcnQtY29tcGlsYXRpb24tc3RhdHVzJyB3aXRoIEZVTiBhbmQKPiBGRUFUVVJFLiIKPiDC oMKgwqDCoMKgIChldmFsIGAodXRpbHMvcmVwb3J0LWNvbXBpbGF0aW9uLXN0YXR1cyAsZnVuICxm ZWF0dXJlKSkpCj4gCj4gwqDCoMKgIChyZXF1aXJlICdmaW5kLWZ1bmMpCj4gwqDCoMKgIChkZWZ1 biB1dGlscy9maW5kLWxpYnJhcnktZGlyIChmZWF0dXJlKQo+IMKgwqDCoMKgwqAgIk91dHB1dCBk aXJlY3Rvcnkgd2hlcmUgRkVBVFVSRSByZXNpZGVzLiIKPiDCoMKgwqDCoMKgIChkaXJlY3Rvcnkt ZmlsZS1uYW1lCj4gwqDCoMKgwqDCoMKgIChmaWxlLW5hbWUtZGlyZWN0b3J5Cj4gwqDCoMKgwqDC oMKgwqAgKGZpbmQtbGlicmFyeS1uYW1lIChzeW1ib2wtbmFtZSBmZWF0dXJlKSkpKSkKPiAKPiDC oMKgwqAgKGRlZnVuIHV0aWxzL3JlcG9ydC1mYWlsaW5nLWNhc2VzIChjYXNlcykKPiDCoMKgwqDC oMKgICJGcm9tIENBU0VTLCByZXBvcnQgZmFpbGluZyB0ZXN0cy4KPiDCoCBUZXN0IGZhaWx1cmUg YXJlIHRob3NlIHdoZXJlIGB1dGlscy9yZXBvcnQtY29tcGlsYXRpb24tc3RhdHVzJwo+IGRvZXNu J3QKPiDCoCByZXBvcnQgbmF0aXZlbHktY29tcGlsZWQuwqAgQ0FTRVMgaXMgYSBsaXN0IHdoZXJl IGVhY2ggZWxlbWVudCBhcmUKPiDCoCBBUkdVTUVOVFMgZm9yIGB1dGlscy9yZXBvcnQtY29tcGls YXRpb24tc3RhdHVzJy4iCj4gwqDCoMKgwqDCoCAobGV0ICgocmVzdWx0cyAobWFwY2FyIChsYW1i ZGEgKGFyZ3MpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChhcHBseSAjJ3V0aWxzL3JlcG9ydC1jb21waWxhdGlvbi0KPiBzdGF0 dXMvYXBwbHkgYXJncykpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgY2FzZXMpKSkKPiDCoMKgwqDCoMKgwqDCoCAoc2VxLWZpbHRlciAo bGFtYmRhICh4KSAobm90IChlcSAoY2RyIHgpICduYXRpdmUtY29tcGlsZWQpKSkKPiDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCByZXN1bHRzKSkpKQo+IAo+IMKgIDs7OyBo YWNrLwo+IMKgIChldmFsLWFuZC1jb21waWxlCj4gwqDCoMKgIChkZWZ1biBoYWNrL25ldy1sb2Fk LXBhdGgtdGhhdC1jYW4tbWFrZS12MTAtdGVzdC1mYWlsdXJlcy1wYXNzICgpCj4gwqDCoMKgwqDC oCAiUmV0dXJuIGEgbGlzdCB0aGF0IGNhbiBiZSB1c2VkIGFzIHRoZSBgbG9hZC1wYXRoJy4KPiAK PiDCoCBUaGUgcmV0dXJuZWQgbGlzdCBpcyBhc3N1cmVkIHRvIGhhdmUgdGhlIGVudHJ5IGZvcgo+ IMKgIHNoYXJlL2VtYWNzLzxlbWFjcy12ZXJzaW9uPi9saXNwIG9jY3VyIGFmdGVyIHRoZSBlbnRy eSBmb3IKPiDCoCBsaXNwL2ludGVybmF0aW9uYWwgKGNvcnJlc3BvbmRpbmcgdG8gdGhlIGBtdWxl LXV0aWwnIGFuZAo+IMKgIGB1Y3Mtbm9ybWFsaXplJyBmYWlsaW5nIHRlc3QgY2FzZXMpIGFuZCB0 aGUgZW50cnkgZm9yIGxpc3AvdGVybQo+IMKgwqAgKGNvcnJlc3BvbmRpbmcgdG8gdGhlIGB0ZXJt L2ludGVybmFsJyBmYWlsaW5nIHRlc3QgY2FzZSkuCj4gCj4gwqAgSWYgdGhlIGBsb2FkLXBhdGgn IGlzIHNldCB0byB0aGUgcmV0dXJuZWQgdmFsdWUsIGFsbCB0ZXN0cyBwYXNzCj4gwqAgaW4gdjEw LsKgIE5vdGFibHksIGluIG5vbi1HdWl4IEVtYWNzIHRoaXMgaXNuJ3QgbmVlZGVkLsKgIEkuZS4s IHRoZQo+IMKgIGZhY3QgdGhhdCB0aGUgc2hhcmUvZW1hY3MvPGVtYWNzLXZlcnNpb24+L2xpc3Ag ZW50cnkgcHJlY2VkZXMgdGhlCj4gwqAgZW50cmllcyBmb3IgYG11bGUtdXRpbCcgYW5kIGB1Y3Mt bm9ybWFsaXplJyBpcyBva2F5IGFzIGlzIHRoZQo+IMKgIGZhY3QgdGhhdCB0aGUgZW50cnkgZm9y IGB0ZXJtL2ludGVybmFsJyBpcyBtaXNzaW5nLiIKPiDCoMKgwqDCoMKgIChldmFsLXdoZW4tY29t cGlsZQo+IMKgwqDCoMKgwqDCoMKgIChyZXF1aXJlICdmaW5kLWZ1bmMpKQo+IMKgwqDCoMKgwqAg Ozsgd2UnbGwgZW5zdXJlIHRoYXQgdGhlIGVudHJ5IGZvciBzaGFyZS9lbWFjcy88ZW1hY3MtCj4g dmVyc2lvbj4vbGlzcCBjb21lcwo+IMKgwqDCoMKgwqAgOzsgYWZ0ZXIgdGhlIGxpc3AvaW50ZXJu YXRpb25hbCBhbmQgbGlzcC90ZXJtIGVudHJpZXMKPiDCoMKgwqDCoMKgIChsZXQqICgobmV3LWxv YWQtcGF0aCBsb2FkLXBhdGgpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGFkZCB0aGUg bWlzc2luZyBlbnRyeSBmb3IgYHRlcm0vaW50ZXJuYWwnCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIChfIChhZGQtdG8tbGlzdCAnbmV3LWxvYWQtcGF0aAo+IMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1dGlscy9maW5kLWxpYnJhcnkt ZGlyICd0ZXJtL2ludGVybmFsKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IE5PVEU6IHdlIGRvbid0IG5lZWQgdG8gYXBwZW5kOyBk b2luZwo+IHNvIHNpbXBseSB0byBjb25maXJtIHRoYXQKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBpdCdzIG9ubHkgdGhlIHJlbGF0 aXZlIHBvc2l0aW9uIHdydAo+IHRoZQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHNoYXJlL2VtYWNzLzxlbWFjcy12ZXJzaW9uPi9s aXNwCj4gZW50cnkgdGhhdCBtYXR0ZXJzLgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHQpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAoc2l0ZWxpc3BwYXRoIChmb3JtYXQgIi9zaGFyZS9lbWFjcy8lcy9saXNwIgo+IMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIGVtYWNzLXZlcnNpb24pKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAocGF0aHN1ZmZp eCAoc2VxLWZpbHRlcgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChsYW1iZGEgKHgpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctc3VmZml4LXAgc2l0ZWxpc3BwYXRoIHgpKQo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIG5ldy1s b2FkLXBhdGgpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAocGF0aHByZWZpeCAoc2VxLWZp bHRlcgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChsYW1iZGEgKHgpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChub3QKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RyaW5nLXN1ZmZpeC1wIHNpdGVsaXNwcGF0aCB4KSkpCj4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgbmV3LWxv YWQtcGF0aCkpKQo+IMKgwqDCoMKgwqDCoMKgIChhcHBlbmQgcGF0aHByZWZpeCBwYXRoc3VmZml4 KSkpKQo+IAo+IMKgIDs7OyBjYXNlcy8KPiDCoCA7OyBbWy91c3Ivc2hhcmUvZW1hY3MvMjkuMi9s aXNwXV0KPiDCoCAoZXZhbC13aGVuLWNvbXBpbGUKPiDCoMKgwqAgKGRlZnZhciBjYXNlcy9lbG4t aW4tcHJlbG9hZGVkLWRpciBuaWwKPiDCoMKgwqDCoMKgICJGdW5jdGlvbnMgdGhhdCBvdWdodCB0 byBiZSBuYXRpdmVseS1jb21waWxlZC4iKQo+IMKgwqDCoCAoc2V0cSBjYXNlcy9lbG4taW4tcHJl bG9hZGVkLWRpcgo+IMKgwqDCoMKgwqDCoMKgwqDCoCAnKChhYmJyZXYtbW9kZSkKPiDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChiYWNrcXVvdGUtcHJvY2VzcykKPiDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIChtb2RlLWxpbmUtd2lkZW4pCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYnVmZmVyLW1l bnUpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBidXJtZXNlCj4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoYnV0dG9uLW1vZGUpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYnl0ZS1ydW4t c3RyaXAtc3ltYm9sLXBvc2l0aW9ucykKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjYXNlLXRh YmxlLWdldC10YWJsZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjY29udi1jb252ZXJ0KQo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgY2hhbQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KHVzZS1kZWZhdWx0LWNoYXItd2lkdGgtdGFibGUpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7 OyBjaGluZXNlCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY2wtZ2VuZXJpYy1wKQo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGNsLXN0cnVjdC1kZWZpbmUpCj4gwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoeC1zZXR1cC1mdW5jdGlvbi1rZXlzKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGVu Y29kZS1jb21wb3NpdGlvbi1ydWxlKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgY3A1MTkz Mgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGN1c3RvbS1kZWNsYXJlLWZhY2UpCj4gwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAobWluaWJ1ZmZlci1wcm9tcHQtcHJvcGVydGllcy0tc2V0dGVyKSA7 OyBjdXMtc3RhcnQuZWwKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjdXN0b20tYWRkLWNob2lj ZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGN5cmlsbGljCj4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCA7OyBjemVjaAo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRlYnVnLWVhcmx5KQo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRpc3BsYXktdGFibGUtc2xvdCBkaXNwLXRhYmxlKSA7 OyBkaXNwLXRhYmxlLmVsbiBleGlzdHMKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChkbmQtb3Bl bi1maWxlKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRvcy1tb2RlMjUgZG9zLWZucynCoMKg wqAgOzsgZG9zLWZucy5lbG4gZXhpc3RzCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBkb3Mt dmFycwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZpbmQtZmlsZS10ZXh0IGRvcy13MzIpIDs7 IGRvcy13MzIuZWxuIGV4aXN0cwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGR5bmFtaWMtc2V0 dGluZy1oYW5kbGUtY29uZmlnLWNoYW5nZWQtZXZlbnQpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAoZWFzeS1tZW51LWl0ZW0tcHJlc2VudC1wKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsg ZWRpZmYtaG9vawo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGVsZG9jLW1vZGUpCj4gwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAoZWxlY3RyaWMtaW5kZW50LW1vZGUpCj4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoZWxpc3AtbW9kZS1zeW50YXgtcHJvcGVydGl6ZSkKPiDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIDs7IGVuZ2xpc2gKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChnZXRlbnYpCj4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoZXBhLWZpbGUtZmluZC1maWxlLWhvb2spCj4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCA7OyBldGhpb3BpYwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgZXVj anAtbXMKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGV1cm9wZWFuCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoZmFjZS1saXN0KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZpbmQtZmls ZS1ub3NlbGVjdCkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmaWxsLXJlZ2lvbikKPiDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIDs7IGZsb2F0LXN1cAo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGZvbnQtbG9jay1jaGFuZ2UtbW9kZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmb250LWxv Y2stYWRkLWtleXdvcmRzKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGZvbnRzZXQtcGxhaW4t bmFtZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmb3JtYXQtcmVhZCkKPiDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChmcmFtZS1lZGdlcykKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmcmlu Z2UtbW9kZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGdlb3JnaWFuCj4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCA7OyBncmVlawo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgaGFpa3Ut d2luCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBoZWJyZXcKPiDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChoZWxwLXF1aWNrKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGltYWdlLXR5cGUp Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoaW5kZW50LXJlZ2lvbikKPiDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChpbmRpYW4tY29tcG9zZS1yZWdleHApCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCA7OyBpbmRvbmVzaWFuCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobXNkb3Mtc2V0dXAta2V5 Ym9hcmQgdGVybS9pbnRlcm5hbCkgOzsgaW50ZXJuYWwuZWxuCj4gZXhpc3RzCj4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoaXNlYXJjaC1hYm9ydCkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChp c28tdHJhbnNsLXNldC1sYW5ndWFnZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IGphcGFu ZXNlCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoaml0LWxvY2stbW9kZSkKPiDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChqa2EtY29tcHItYnVpbGQtZmlsZS1yZWdleHApCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoa2V5bWFwLWdsb2JhbC1zZXQpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7 OyBraG1lcgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsga29yZWFuCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCA7OyBsYW8KPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmb3J3YXJkLXNleHAp Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGlzcC1zdHJpbmctaW4tZG9jLXBvc2l0aW9uLXAp Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobHMtbGlzcC1zZXQtb3B0aW9ucyBscy1saXNwKSA7 OyBscy1saXNwLmVsbiBleGlzdHMKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYWNyb2V4cC1j b21waWxpbmctcCkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtYXAteS1vci1uLXApCj4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAobWVudS1maW5kLWZpbGUtZXhpc3RpbmcpCj4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoY29tcGxldGlvbi1ib3VuZGFyaWVzKQo+IMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKGVneXB0aWFuLXNoYXBlLWdyb3VwaW5nKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KG1vdXNlLWRvdWJsZS1jbGljay10aW1lKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbnZl cnQtZGVmaW5lLWNoYXJzZXQtYXJndW1lbnQpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29k aW5nLXN5c3RlbS1jaGFuZ2UtZW9sLWNvbnZlcnNpb24pCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCA7OyBtdWxlLWNvbmYuZWxuCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RvcmUtc3Vic3Ry aW5nIG11bGUtdXRpbCkgOzsgbXVsZS11dGlsLmVsbiBleGlzdHMKPiDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChtb3VzZS13aGVlbC1jaGFuZ2UtYnV0dG9uKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKGFkdmljZS1mdW5jdGlvbi1tYXBjKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbW1l bnQtc3RyaW5nLXN0cmlwKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgKG5zLWhhbmRsZS1u eG9wZW4gdGVybS9ucy13aW4pCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAob2JhcnJheS1tYWtl KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG9jbG9zdXJlLXR5cGUpCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoZm9yd2FyZC1wYWdlKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHNlbnRl bmNlLWVuZCkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzaG93LXBhcmVuLWZ1bmN0aW9uKQo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgKG1zZG9zLWZhY2Utc2V0dXAgdGVybS9wYy13aW4p Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAocGd0ay1kbmQtaW5pdC1mcmFtZSBwZ3RrLWRuZCkg OzsgcGd0ay1kbmQuZWxuIGV4aXN0cwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgKHBndGst ZHJhZy1uLWRyb3AgdGVybS9wZ3RrLXdpbikKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHBo aWxpcHBpbmUKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChwcm9nLWNvbnRleHQtbWVudSkKPiDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChyZWdleHAtb3B0KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKGdldC1yZWdpc3RlcikKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChxdWVyeS1yZXBsYWNl LWRlc2NyKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHJmbi1lc2hhZG93LXNldHVwLW1pbmli dWZmZXIpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAocmVhZC1tdWx0aXBsZS1jaG9pY2UpCj4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyByb21hbmlhbgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKHNjcm9sbC1iYXItc2NhbGUpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZ3VpLXNlbGVj dC10ZXh0KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHNlcS1maXJzdCkKPiDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChoYWNrLXJlYWQtc3ltYm9sLXNob3J0aGFuZHMpCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAobmV4dC1lcnJvci1maW5kLWJ1ZmZlcikKPiDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIDs7IHNpbmhhbGEKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHNsb3Zhawo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKGV4aXQtc3BsYXNoLXNjcmVlbikKPiDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChidWZmZXItbG9jYWwtYm91bmRwKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN5 bnRheC1wcm9wZXJ0aXplLW11bHRpbGluZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh0YWIt YmFyLW1vZGUpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodGFidWxhdGVkLWxpc3QtcHV0LXRh ZykKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IHRhaS12aWV0Cj4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAodGV4dC1tb2RlKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgdGhhaQo+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgdGliZXRhbgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KHRpbWVyLWFjdGl2YXRlKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHRvb2wtYmFyLW1vZGUp Cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodG9vbHRpcC1tb2RlKQo+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKHR0eS1jb2xvci1kZXNjKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHVjcy1u b3JtYWxpemUtaGZzLW5mZC1jb21wLXAgdWNzLW5vcm1hbGl6ZSkgOzsgdWNzLQo+IG5vcm1hbGl6 ZS5lbG4gZXhpc3RzCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodW5pcXVpZnktaXRlbS1wKQo+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgdXRmLTgtbGFuZy5lbG4KPiDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgICh2Yy1tb2RlKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGVtYWNzLXZlcnNp b24pCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyB2aWV0bmFtZXNlCj4gwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCA7OyAodzMyLXNoZWxsLW5hbWUpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7 OyB3MzItdmFycy5lbG4KPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7ICh3MzItaGFuZGxlLWRy b3BwZWQtZmlsZSAndGVybS93MzItd2luKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRlZmlu ZS13aWRnZXQpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAod2luZG93LXJpZ2h0KQo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKHgtZG5kLWluaXQtZnJhbWUpCj4gwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoeC1oYW5kbGUtbm8tYml0bWFwLWljb24pKSkpCj4gCj4gwqAgOzs7IEVSVCB0ZXN0cwo+ IMKgIChlcnQtZGVmdGVzdCAwMS1uYXRpdmVseS1jb21waWxlZC1mZWF0dXJlcy1wYXNzaW5nLWFz LW9mLXYxMCAoKQo+IMKgwqDCoCAiVGhlIDk0IGNhc2VzIHdoaWNoIHBhc3MgZm9yIHYxMCBwYXRj aCBzZXJpZXMuCj4gwqAgVGhlc2UgY2FzZXMgYXJlIHRha2VuIGZyb20gLmVsbiBmaWxlcyB0aGF0 IGFyZSBsb2NhdGVkIGluIHRoZQo+IHByZWxvYWRlZAo+IMKgIGRpcmVjdG9yeSBmb3Igbm9uLUd1 aXggRW1hY3MuIgo+IMKgwqDCoCAoZXZhbC13aGVuLWNvbXBpbGUKPiDCoMKgwqDCoMKgIChsZXQg KChjYXNlcyAoc2VxLWZpbHRlciAobGFtYmRhICh4KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG5vdCAobWVtcSAoY2Fk ciB4KSAnKG11bGUtdXRpbAo+IHRlcm0vaW50ZXJuYWwgdWNzLW5vcm1hbGl6ZSkpKSkKPiDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg Y2FzZXMvZWxuLWluLXByZWxvYWRlZC1kaXIpKSkKPiDCoMKgwqDCoMKgwqDCoCAoc2hvdWxkLW5v dCAodXRpbHMvcmVwb3J0LWZhaWxpbmctY2FzZXMgY2FzZXMpKSkpKQo+IAo+IMKgIChlcnQtZGVm dGVzdCAwMi1uYXRpdmVseS1jb21waWxlZC1mZWF0dXJlcy1mYWlsaW5nLWFzLW9mLXYxMCAoKQo+ IMKgwqDCoCAiVGhlIDMgY2FzZXMgd2hpY2ggZmFpbCBmb3IgdjEwIHBhdGNoIHNlcmllcyBvbiBH dWl4IEVtYWNzLgo+IMKgIFRoZXNlIGNhc2VzIGFyZSB0YWtlbiBmcm9tIC5lbG4gZmlsZXMgdGhh dCBhcmUgbG9jYXRlZCBpbiB0aGUKPiBwcmVsb2FkZWQKPiDCoCBkaXJlY3RvcnkgZm9yIG5vbi1H dWl4IEVtYWNzLiIKPiDCoMKgwqAgOmV4cGVjdGVkLXJlc3VsdCAoaWYgKGdldGVudiAiR1VJWF9F TlZJUk9OTUVOVCIpClRoYXQgaXMgbm90IGEgZ29vZCB3YXkgb2YgY2hlY2tpbmcgd2hldGhlciBp dCdzIEd1aXgnIGVtYWNzIG9yIG5vdC4gIEkKcHJvcG9zZSBkb2luZyBhIHBlci1maWxlIGRlZnRl c3QgaW5zdGVhZC4KPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgOmZhaWxlZAo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIDpwYXNzZWQpCj4gwqDCoMKgIChzaG91bGQtbm90Cj4gwqDCoMKgwqAgKGV2YWwtd2hlbi1j b21waWxlCj4gwqDCoMKgwqDCoMKgIChsZXQgKChjYXNlcyAoc2VxLWZpbHRlciAobGFtYmRhICh4 KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAobWVtcSAoY2FkciB4KSAnKG11bGUtdXRpbAo+IHRlcm0vaW50ZXJuYWwg dWNzLW5vcm1hbGl6ZSkpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGNhc2VzL2Vsbi1pbi1wcmVsb2FkZWQtZGlyKSkpCj4g wqDCoMKgwqDCoMKgwqDCoCAodXRpbHMvcmVwb3J0LWZhaWxpbmctY2FzZXMgY2FzZXMpKSkpKQo+ IAo+IMKgIChlcnQtZGVmdGVzdCAwMy1zb21lLWZlYXR1cmVzLWluLWxhdGVyLWxvYWQtcGF0aC1l bnRyaWVzLWFyZS1zdGlsbC0KPiBuYXRpdmVseS1jb21waWxlZCAoKQo+IMKgwqDCoCAiVGhlc2Ug Y2FzZXMgcGFzcyBhcyBvZiB2MTAgb2YgdGhlIHBhdGNoLgo+IMKgIFRoZXNlIGNhc2VzIHNoYXJl IHRoZSBmYWN0IHRoYXQgdGhlaXIgZGlyZWN0b3J5IGVudHJpZXMgb2NjdXIgaW4KPiDCoCB0aGUg YGxvYWQtcGF0aCcgYWZ0ZXIgdGhlICRwcmVmaXgvc2hhcmUvZW1hY3MvJGVtYWNzX3ZlcnNpb24v bGlzcAo+IMKgIGVudHJ5LsKgIFRoaXMgaXMgc29tZXRoaW5nIHRoZXNlIGNhc2VzIGhhdmUgaW4g Y29tbW9uIHdpdGggdGhlCj4gwqAgdGhyZWUgY2FzZXMgdGhhdCBhcmUga25vd24gdG8gZmFpbCwg aG93ZXZlciwgdW5saWtlIHRoZW0gdGhlc2UKPiDCoCBzdWNjZWVkIChpLmUuLCBuYXRpdmVseS1j b21waWxlZCB2YXJpYW50cyBhcmUgbG9hZGVkKS4iCj4gwqDCoMKgIChldmFsLXdoZW4tY29tcGls ZQo+IMKgwqDCoMKgwqAgKGxldCogKChjYXNlcyAnKChjbC1wb3NpdGlvbiBjbC1zZXEpCj4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChmaW5kLWxpYnJhcnktbmFt ZSBmaW5kLWZ1bmMpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChsb2ctZWRpdCBsb2ctZWRpdCkpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZmFpbGlu ZyAodXRpbHMvcmVwb3J0LWZhaWxpbmctY2FzZXMgY2FzZXMpKQo+IMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoZmVhdHVyZXMtbG9hZHBhdGgtZW50cmllcyAobWFwY2FyICMndXRpbHMvZmluZC1s aWJyYXJ5LQo+IGRpcgo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKG1h cGNhciAjJ2NhZHIKPiBjYXNlcykpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZmVhdHVy ZXMtZW50cnktcG9zIChtYXBjYXIgKGxhbWJkYSAoeCkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKGNsLXBvc2l0aW9uCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHV0aWxz L2ZpbmQtbGlicmFyeS1kaXIKPiAoY2FkciB4KSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCBsb2FkLXBhdGggOnRlc3QgIydlcXVhbCkpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg Y2FzZXMpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2hhcmUtZW1hY3MtbGlzcC1lbnRy eS1wb3MgKGNsLXBvc2l0aW9uCj4gIi9zaGFyZS9lbWFjcy8yOS4yL2xpc3AiCj4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBsb2FkLXBhdGgKPiDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDp0ZXN0ICMnc3Ry aW5nLQo+IHN1ZmZpeC1wKSkpCj4gwqDCoMKgwqDCoMKgwqAgKHNob3VsZC1ub3QgZmFpbGluZykK PiDCoMKgwqDCoMKgwqDCoCAoc2hvdWxkLW5vdCAoc2VxLWZpbHRlciAobGFtYmRhICh4KSAoPCB4 IHNoYXJlLWVtYWNzLWxpc3AtCj4gZW50cnktcG9zKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBmZWF0dXJlcy1lbnRyeS1w b3MpKSkpKQo+IAo+IMKgIChlcnQtZGVmdGVzdCAwNC1sb2FkLXBhdGgtb3JkZXItc2hvdWxkLW5v dC1kZXRlcm1pbmUtbmF0aXZlbHktCj4gY29tcGlsZWQtc3RhdHVzICgpCj4gwqDCoMKgICJUaGlz IHNlZW1zIGxpa2UgYW4gaW52YXJpYW50IHRoYXQgd291bGQgYmUgdXNlZnVsIHRvIGhhdmUuCj4g wqAgSXQgaXMgdW5jbGVhciBpZiB0aGlzIGlzIGd1YXJhbnRlZWQgYnkgdXBzdHJlYW0gRW1hY3Ms IGJ1dAo+IMKgIG9ic2VydmF0aW9ucyBzZWVtIGNvbnNpc3RlbnQgd2l0aCBpdC4iCj4gwqDCoMKg IDpleHBlY3RlZC1yZXN1bHQgKGlmIChnZXRlbnYgIkdVSVhfRU5WSVJPTk1FTlQiKQo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA6ZmFpbGVkCj4gwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOnBhc3NlZCkKPiDCoMKg wqAgKGV2YWwtd2hlbi1jb21waWxlCj4gwqDCoMKgwqDCoCAoZGVmdmFyIG9yaWdpbmFsLWxvYWQt cGF0aCBsb2FkLXBhdGgpKQo+IMKgwqDCoCAobGV0ICgoZmFpbHVyZXMtcHJpb3ItdG8tbG9hZC1w YXRoLXNodWZmbGUKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZXZhbC13aGVuLWNvbXBpbGUKPiDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHV0aWxzL3JlcG9ydC1mYWlsaW5nLWNhc2VzIGNhc2Vz L2Vsbi1pbi1wcmVsb2FkZWQtCj4gZGlyKSkpCj4gwqDCoMKgwqDCoMKgwqDCoMKgIChmYWlsdXJl cy1wb3N0LWxvYWQtcGF0aC1zaHVmZmxlCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGV2YWwtd2hl bi1jb21waWxlCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChwcm9nbgo+IMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKHNldHEgbG9hZC1wYXRoCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoaGFjay9uZXctbG9hZC1wYXRoLXRoYXQtY2FuLW1ha2UtdjEw LXRlc3QtCj4gZmFpbHVyZXMtcGFzcykpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo ZG9saXN0IChpdGVtIGNhc2VzL2Vsbi1pbi1wcmVsb2FkZWQtZGlyKQo+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICh3aGVuIChjYWRyIGl0ZW0pCj4gwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICh1bmxvYWQtZmVhdHVyZSAoY2FkciBpdGVtKSkpKQo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHV0aWxzL3JlcG9ydC1mYWlsaW5nLWNhc2VzIGNhc2Vz L2Vsbi1pbi1wcmVsb2FkZWQtCj4gZGlyKSkpKSkKPiDCoMKgwqDCoMKgIChzaG91bGQgKGVxdWFs IGZhaWx1cmVzLXByaW9yLXRvLWxvYWQtcGF0aC1zaHVmZmxlCj4gwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBmYWlsdXJlcy1wb3N0LWxvYWQtcGF0aC1zaHVmZmxlKSkp KQo+IAo+IMKgIChlcnQtZGVmdGVzdCAwNS10aGVyZS1leGlzdHMtbG9hZC1wYXRoLW9yZGVyLXdo ZXJlLWFsbC10ZXN0cy1wYXNzCj4gKCkKPiDCoMKgwqAgIlByb29mIHdpdG5lc3MgdGhhdCB0aGUg djEwIGZhaWxpbmcgY2FzZXMgcmVsYXRlIHRvIGxvYWQtcGF0aAo+IG9yZGVyaW5nLiIKPiDCoMKg wqAgKHNob3VsZC1ub3QgKGV2YWwtd2hlbi1jb21waWxlCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAod2hlbiAoYW5kIChib3VuZHAgJ29yaWdpbmFsLWxvYWQtcGF0aCkgb3Jp Z2luYWwtCj4gbG9hZC1wYXRoKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgIChzZXRxIGxvYWQtcGF0aCBvcmlnaW5hbC1sb2FkLXBhdGgpCj4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGRvbGlzdCAoaXRlbSBjYXNlcy9lbG4taW4tcHJlbG9h ZGVkLWRpcikKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHdo ZW4gKGNhZHIgaXRlbSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgICh1bmxvYWQtZmVhdHVyZSAoY2FkciBpdGVtKSkpKSkKPiDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChkZWZ2YXIgb3JpZ2luYWwtbG9hZC1wYXRoIGxvYWQtcGF0aCkK PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzZXRxIGxvYWQtcGF0aAo+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGhhY2svbmV3LWxv YWQtcGF0aC10aGF0LWNhbi1tYWtlLXYxMC10ZXN0LQo+IGZhaWx1cmVzLXBhc3MpKQo+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHV0aWxzL3JlcG9ydC1mYWlsaW5nLWNhc2Vz IGNhc2VzL2Vsbi1pbi1wcmVsb2FkZWQtCj4gZGlyKSkpKQo+IAo+IMKgIDs7OyB0ZXN0LW5hdGl2 ZS1jb21wLXAuZWwgZW5kcyBoZXJlCj4gIytlbmRfc3JjCkNvdWxkIHlvdSBkbyBhIE1JTUUgYXR0 YWNobWVudCBuZXh0IHRpbWU/ICBJIHRoaW5rIEkga25vdyB0aGUgaGVhcnQgb2YKdGhlIGlzc3Vl IG5vdywgYnV0IEkgc3RpbGwgbmVlZCB0byBjb2RlIHVwIGEgc29sdXRpb24uCgpDaGVlcnMKCg== From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 20 13:42:52 2024 Received: (at 67260) by debbugs.gnu.org; 20 Feb 2024 18:42:52 +0000 Received: from localhost ([127.0.0.1]:46551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcV4t-0000xu-4y for submit@debbugs.gnu.org; Tue, 20 Feb 2024 13:42:51 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]:45183) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcV4p-0000xZ-3u for 67260@debbugs.gnu.org; Tue, 20 Feb 2024 13:42:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1708454537; x=1708713737; bh=YR5HihZSabRmK026Wl6gzobCCP11lT2wWNy0Kkr1g8w=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=gaMm0VOF3Hg8oEkzGPSmofWlpdf3aSweZHrgoqKYRO025ilnWXVRJ2rY7TF/AevAh kSr9xBsOzNP2NVA2FUqYqqUWXd22Y12AyiHYdPflUUc2XQw/JuYJx7K04Db5SKAPxo esePioEd/lZxr8YzEl8KkFFrbawPDXXz5/q4Gxlvab6bTfVZA9h48snFNMe8C6JYYv 8Ze0GUWuVDAdBiY3pm79iM1lcebZ3uiuDRh8MfHJck12/7gnqckgEBb3n75SGCI/j0 m9/C/DxARXDz50Xrs2LHbPhJ4b/otLbERdf4ZbWndlNDOKPWhRYWVnvH4CwUO/qyqL dv7chZaPKA4yg== Date: Tue, 20 Feb 2024 18:41:50 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH emacs-team v10 0/7] Preload most of the things Message-ID: <878r3f3rme.fsf@bayesians.ca> In-Reply-To: <76a4267be5c73908490e5d70bf22d109aca395cb.camel@gmail.com> References: <875xyndu36.fsf@bayesians.ca> <87il2megkb.fsf@gmail.com> <87ttm4uo4h.fsf@gmail.com> <76a4267be5c73908490e5d70bf22d109aca395cb.camel@gmail.com> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_StheWvR7uln40H9UNRpyRThyw7R2pi8tnTZKRRV52FA" X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) This is a multi-part message in MIME format. --b1_StheWvR7uln40H9UNRpyRThyw7R2pi8tnTZKRRV52FA Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "Liliana Marie Prikler" writes: > We still only have 97 tests squashed to 5 cases IIUC. Yes. > There's some 1000 files in the native-lisp directory. What I was > actually hoping for is more or less one test per feature. Yes, I agree that that would be useful, but doing so was (is) more than what I was (am) able to do in the time I was (am) able to commit (at present). I believe it would be valuable to have such an exhaustive test included as part of the patch submission to prevent future regressions. > That is not a good way of checking whether it's Guix' emacs or not. What would be a better way? Matching against the --prefix value in the output of emacs-build-description function? > I propose doing a per-file deftest instead. I don't understand the connection between a per-file deftest and the manner in which guix-emacs-or-not is tested, but otherwise agree on the utility of per-feature deftests. > Could you do a MIME attachment next time? Sure. For now, for what it's worth and in case it helps, please see attached a copy of the same file as before. --=20 Suhail --b1_StheWvR7uln40H9UNRpyRThyw7R2pi8tnTZKRRV52FA Content-Type: text/x-emacs-lisp; charset=UTF-8; name=test-native-comp-p.el Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=test-native-comp-p.el Ozs7IENvZGU6DQoocmVxdWlyZSAnZXJ0KQ0KKHNldHEgZXJ0LXF1aWV0IG5pbA0KICAgICAgZXJ0 LWJhdGNoLXByaW50LWxldmVsIDEwDQogICAgICBlcnQtYmF0Y2gtcHJpbnQtbGVuZ3RoIDEwDQog ICAgICBlcnQtYmF0Y2gtYmFja3RyYWNlLWxpbmUtbGVuZ3RoIHQpDQoNCjs7OyB1dGlscy8NCihl dmFsLWFuZC1jb21waWxlDQogIChyZXF1aXJlICdoZWxwLWZucykNCiAgKGRlZm1hY3JvIHV0aWxz L3JlcG9ydC1jb21waWxhdGlvbi1zdGF0dXMgKGZ1biAmb3B0aW9uYWwgZmVhdHVyZSkNCiAgICAi UmVwb3J0IG9uIHRoZSBjb21waWxhdGlvbiBzdGF0dXMgb2YgZnVuY3Rpb24gRlVOLg0KT3B0aW9u YWxseSBsb2FkIEZFQVRVUkUgYmVmb3JlIHJlcG9ydGluZyBvbiBjb21waWxhdGlvbiBzdGF0dXMu Ig0KICAgIGAocHJvZ24NCiAgICAgICAoZXZhbC13aGVuLWNvbXBpbGUNCiAgICAgICAgICh3aGVu ICcsZmVhdHVyZQ0KICAgICAgICAgICAocmVxdWlyZSAnLGZlYXR1cmUpKSkNCiAgICAgICAobGV0 ICgoZGVzY3N0ciAoc3Vic3RyaW5nLW5vLXByb3BlcnRpZXMNCiAgICAgICAgICAgICAgICAgICAg ICAgKHdpdGgtb3V0cHV0LXRvLXN0cmluZw0KICAgICAgICAgICAgICAgICAgICAgICAgIChoZWxw LWZucy1mdW5jdGlvbi1kZXNjcmlwdGlvbi1oZWFkZXIgJyxmdW4pKSkpKQ0KICAgICAgICAgKGNv bnMgJyxmdW4NCiAgICAgICAgICAgICAgIChjb25kDQogICAgICAgICAgICAgICAgKChzdHJpbmct c2VhcmNoICIgbmF0aXZlLWNvbXBpbGVkIiBkZXNjc3RyKSAnbmF0aXZlLWNvbXBpbGVkKQ0KICAg ICAgICAgICAgICAgIDs7ICgoc3RyaW5nLXNlYXJjaCAiIGF1dG9sb2FkZWQiIGRlc2NzdHIpIGRl c2NzdHIpDQogICAgICAgICAgICAgICAgKChzdHJpbmctc2VhcmNoICIgYnl0ZS1jb21waWxlZCIg ZGVzY3N0cikgJ2J5dGUtY29tcGlsZWQpDQogICAgICAgICAgICAgICAgKHQgZGVzY3N0cikpKSkp KQ0KDQogIChkZWZ1biB1dGlscy9yZXBvcnQtY29tcGlsYXRpb24tc3RhdHVzL2FwcGx5IChmdW4g Jm9wdGlvbmFsIGZlYXR1cmUpDQogICAgIkludm9rZSBgdXRpbHMvcmVwb3J0LWNvbXBpbGF0aW9u LXN0YXR1cycgd2l0aCBGVU4gYW5kIEZFQVRVUkUuIg0KICAgIChldmFsIGAodXRpbHMvcmVwb3J0 LWNvbXBpbGF0aW9uLXN0YXR1cyAsZnVuICxmZWF0dXJlKSkpDQoNCiAgKHJlcXVpcmUgJ2ZpbmQt ZnVuYykNCiAgKGRlZnVuIHV0aWxzL2ZpbmQtbGlicmFyeS1kaXIgKGZlYXR1cmUpDQogICAgIk91 dHB1dCBkaXJlY3Rvcnkgd2hlcmUgRkVBVFVSRSByZXNpZGVzLiINCiAgICAoZGlyZWN0b3J5LWZp bGUtbmFtZQ0KICAgICAoZmlsZS1uYW1lLWRpcmVjdG9yeQ0KICAgICAgKGZpbmQtbGlicmFyeS1u YW1lIChzeW1ib2wtbmFtZSBmZWF0dXJlKSkpKSkNCg0KICAoZGVmdW4gdXRpbHMvcmVwb3J0LWZh aWxpbmctY2FzZXMgKGNhc2VzKQ0KICAgICJGcm9tIENBU0VTLCByZXBvcnQgZmFpbGluZyB0ZXN0 cy4NClRlc3QgZmFpbHVyZSBhcmUgdGhvc2Ugd2hlcmUgYHV0aWxzL3JlcG9ydC1jb21waWxhdGlv bi1zdGF0dXMnIGRvZXNuJ3QNCnJlcG9ydCBuYXRpdmVseS1jb21waWxlZC4gIENBU0VTIGlzIGEg bGlzdCB3aGVyZSBlYWNoIGVsZW1lbnQgYXJlDQpBUkdVTUVOVFMgZm9yIGB1dGlscy9yZXBvcnQt Y29tcGlsYXRpb24tc3RhdHVzJy4iDQogICAgKGxldCAoKHJlc3VsdHMgKG1hcGNhciAobGFtYmRh IChhcmdzKQ0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYXBwbHkgIyd1dGlscy9yZXBv cnQtY29tcGlsYXRpb24tc3RhdHVzL2FwcGx5IGFyZ3MpKQ0KICAgICAgICAgICAgICAgICAgICAg ICAgICAgY2FzZXMpKSkNCiAgICAgIChzZXEtZmlsdGVyIChsYW1iZGEgKHgpIChub3QgKGVxIChj ZHIgeCkgJ25hdGl2ZS1jb21waWxlZCkpKQ0KICAgICAgICAgICAgICAgICAgcmVzdWx0cykpKSkN Cg0KOzs7IGhhY2svDQooZXZhbC1hbmQtY29tcGlsZQ0KICAoZGVmdW4gaGFjay9uZXctbG9hZC1w YXRoLXRoYXQtY2FuLW1ha2UtdjEwLXRlc3QtZmFpbHVyZXMtcGFzcyAoKQ0KICAgICJSZXR1cm4g YSBsaXN0IHRoYXQgY2FuIGJlIHVzZWQgYXMgdGhlIGBsb2FkLXBhdGgnLg0KDQpUaGUgcmV0dXJu ZWQgbGlzdCBpcyBhc3N1cmVkIHRvIGhhdmUgdGhlIGVudHJ5IGZvcg0Kc2hhcmUvZW1hY3MvPGVt YWNzLXZlcnNpb24+L2xpc3Agb2NjdXIgYWZ0ZXIgdGhlIGVudHJ5IGZvcg0KbGlzcC9pbnRlcm5h dGlvbmFsIChjb3JyZXNwb25kaW5nIHRvIHRoZSBgbXVsZS11dGlsJyBhbmQNCmB1Y3Mtbm9ybWFs aXplJyBmYWlsaW5nIHRlc3QgY2FzZXMpIGFuZCB0aGUgZW50cnkgZm9yIGxpc3AvdGVybQ0KIChj b3JyZXNwb25kaW5nIHRvIHRoZSBgdGVybS9pbnRlcm5hbCcgZmFpbGluZyB0ZXN0IGNhc2UpLg0K DQpJZiB0aGUgYGxvYWQtcGF0aCcgaXMgc2V0IHRvIHRoZSByZXR1cm5lZCB2YWx1ZSwgYWxsIHRl c3RzIHBhc3MNCmluIHYxMC4gIE5vdGFibHksIGluIG5vbi1HdWl4IEVtYWNzIHRoaXMgaXNuJ3Qg bmVlZGVkLiAgSS5lLiwgdGhlDQpmYWN0IHRoYXQgdGhlIHNoYXJlL2VtYWNzLzxlbWFjcy12ZXJz aW9uPi9saXNwIGVudHJ5IHByZWNlZGVzIHRoZQ0KZW50cmllcyBmb3IgYG11bGUtdXRpbCcgYW5k IGB1Y3Mtbm9ybWFsaXplJyBpcyBva2F5IGFzIGlzIHRoZQ0KZmFjdCB0aGF0IHRoZSBlbnRyeSBm b3IgYHRlcm0vaW50ZXJuYWwnIGlzIG1pc3NpbmcuIg0KICAgIChldmFsLXdoZW4tY29tcGlsZQ0K ICAgICAgKHJlcXVpcmUgJ2ZpbmQtZnVuYykpDQogICAgOzsgd2UnbGwgZW5zdXJlIHRoYXQgdGhl IGVudHJ5IGZvciBzaGFyZS9lbWFjcy88ZW1hY3MtdmVyc2lvbj4vbGlzcCBjb21lcw0KICAgIDs7 IGFmdGVyIHRoZSBsaXNwL2ludGVybmF0aW9uYWwgYW5kIGxpc3AvdGVybSBlbnRyaWVzDQogICAg KGxldCogKChuZXctbG9hZC1wYXRoIGxvYWQtcGF0aCkNCiAgICAgICAgICAgOzsgYWRkIHRoZSBt aXNzaW5nIGVudHJ5IGZvciBgdGVybS9pbnRlcm5hbCcNCiAgICAgICAgICAgKF8gKGFkZC10by1s aXN0ICduZXctbG9hZC1wYXRoDQogICAgICAgICAgICAgICAgICAgICAgICAgICAodXRpbHMvZmlu ZC1saWJyYXJ5LWRpciAndGVybS9pbnRlcm5hbCkNCiAgICAgICAgICAgICAgICAgICAgICAgICAg IDs7IE5PVEU6IHdlIGRvbid0IG5lZWQgdG8gYXBwZW5kOyBkb2luZyBzbyBzaW1wbHkgdG8gY29u ZmlybSB0aGF0DQogICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBpdCdzIG9ubHkgdGhlIHJl bGF0aXZlIHBvc2l0aW9uIHdydCB0aGUNCiAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IHNo YXJlL2VtYWNzLzxlbWFjcy12ZXJzaW9uPi9saXNwIGVudHJ5IHRoYXQgbWF0dGVycy4NCiAgICAg ICAgICAgICAgICAgICAgICAgICAgIHQpKQ0KICAgICAgICAgICAoc2l0ZWxpc3BwYXRoIChmb3Jt YXQgIi9zaGFyZS9lbWFjcy8lcy9saXNwIg0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZW1hY3MtdmVyc2lvbikpDQogICAgICAgICAgIChwYXRoc3VmZml4IChzZXEtZmlsdGVyDQog ICAgICAgICAgICAgICAgICAgICAgICAobGFtYmRhICh4KQ0KICAgICAgICAgICAgICAgICAgICAg ICAgICAoc3RyaW5nLXN1ZmZpeC1wIHNpdGVsaXNwcGF0aCB4KSkNCiAgICAgICAgICAgICAgICAg ICAgICAgIG5ldy1sb2FkLXBhdGgpKQ0KICAgICAgICAgICAocGF0aHByZWZpeCAoc2VxLWZpbHRl cg0KICAgICAgICAgICAgICAgICAgICAgICAgKGxhbWJkYSAoeCkNCiAgICAgICAgICAgICAgICAg ICAgICAgICAgKG5vdA0KICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1zdWZmaXgt cCBzaXRlbGlzcHBhdGggeCkpKQ0KICAgICAgICAgICAgICAgICAgICAgICAgbmV3LWxvYWQtcGF0 aCkpKQ0KICAgICAgKGFwcGVuZCBwYXRocHJlZml4IHBhdGhzdWZmaXgpKSkpDQoNCjs7OyBjYXNl cy8NCjs7IFtbL3Vzci9zaGFyZS9lbWFjcy8yOS4yL2xpc3BdXQ0KKGV2YWwtd2hlbi1jb21waWxl DQogIChkZWZ2YXIgY2FzZXMvZWxuLWluLXByZWxvYWRlZC1kaXIgbmlsDQogICAgIkZ1bmN0aW9u cyB0aGF0IG91Z2h0IHRvIGJlIG5hdGl2ZWx5LWNvbXBpbGVkLiIpDQogIChzZXRxIGNhc2VzL2Vs bi1pbi1wcmVsb2FkZWQtZGlyDQogICAgICAgICcoKGFiYnJldi1tb2RlKQ0KICAgICAgICAgIChi YWNrcXVvdGUtcHJvY2VzcykNCiAgICAgICAgICAobW9kZS1saW5lLXdpZGVuKQ0KICAgICAgICAg IChidWZmZXItbWVudSkNCiAgICAgICAgICA7OyBidXJtZXNlDQogICAgICAgICAgKGJ1dHRvbi1t b2RlKQ0KICAgICAgICAgIChieXRlLXJ1bi1zdHJpcC1zeW1ib2wtcG9zaXRpb25zKQ0KICAgICAg ICAgIChjYXNlLXRhYmxlLWdldC10YWJsZSkNCiAgICAgICAgICAoY2NvbnYtY29udmVydCkNCiAg ICAgICAgICA7OyBjaGFtDQogICAgICAgICAgKHVzZS1kZWZhdWx0LWNoYXItd2lkdGgtdGFibGUp DQogICAgICAgICAgOzsgY2hpbmVzZQ0KICAgICAgICAgIChjbC1nZW5lcmljLXApDQogICAgICAg ICAgKGNsLXN0cnVjdC1kZWZpbmUpDQogICAgICAgICAgKHgtc2V0dXAtZnVuY3Rpb24ta2V5cykN CiAgICAgICAgICAoZW5jb2RlLWNvbXBvc2l0aW9uLXJ1bGUpDQogICAgICAgICAgOzsgY3A1MTkz Mg0KICAgICAgICAgIChjdXN0b20tZGVjbGFyZS1mYWNlKQ0KICAgICAgICAgIChtaW5pYnVmZmVy LXByb21wdC1wcm9wZXJ0aWVzLS1zZXR0ZXIpIDs7IGN1cy1zdGFydC5lbA0KICAgICAgICAgIChj dXN0b20tYWRkLWNob2ljZSkNCiAgICAgICAgICA7OyBjeXJpbGxpYw0KICAgICAgICAgIDs7IGN6 ZWNoDQogICAgICAgICAgKGRlYnVnLWVhcmx5KQ0KICAgICAgICAgIChkaXNwbGF5LXRhYmxlLXNs b3QgZGlzcC10YWJsZSkgOzsgZGlzcC10YWJsZS5lbG4gZXhpc3RzDQogICAgICAgICAgKGRuZC1v cGVuLWZpbGUpDQogICAgICAgICAgKGRvcy1tb2RlMjUgZG9zLWZucykgICAgOzsgZG9zLWZucy5l bG4gZXhpc3RzDQogICAgICAgICAgOzsgZG9zLXZhcnMNCiAgICAgICAgICAoZmluZC1maWxlLXRl eHQgZG9zLXczMikgOzsgZG9zLXczMi5lbG4gZXhpc3RzDQogICAgICAgICAgKGR5bmFtaWMtc2V0 dGluZy1oYW5kbGUtY29uZmlnLWNoYW5nZWQtZXZlbnQpDQogICAgICAgICAgKGVhc3ktbWVudS1p dGVtLXByZXNlbnQtcCkNCiAgICAgICAgICA7OyBlZGlmZi1ob29rDQogICAgICAgICAgKGVsZG9j LW1vZGUpDQogICAgICAgICAgKGVsZWN0cmljLWluZGVudC1tb2RlKQ0KICAgICAgICAgIChlbGlz cC1tb2RlLXN5bnRheC1wcm9wZXJ0aXplKQ0KICAgICAgICAgIDs7IGVuZ2xpc2gNCiAgICAgICAg ICAoZ2V0ZW52KQ0KICAgICAgICAgIChlcGEtZmlsZS1maW5kLWZpbGUtaG9vaykNCiAgICAgICAg ICA7OyBldGhpb3BpYw0KICAgICAgICAgIDs7IGV1Y2pwLW1zDQogICAgICAgICAgOzsgZXVyb3Bl YW4NCiAgICAgICAgICAoZmFjZS1saXN0KQ0KICAgICAgICAgIChmaW5kLWZpbGUtbm9zZWxlY3Qp DQogICAgICAgICAgKGZpbGwtcmVnaW9uKQ0KICAgICAgICAgIDs7IGZsb2F0LXN1cA0KICAgICAg ICAgIChmb250LWxvY2stY2hhbmdlLW1vZGUpDQogICAgICAgICAgKGZvbnQtbG9jay1hZGQta2V5 d29yZHMpDQogICAgICAgICAgKGZvbnRzZXQtcGxhaW4tbmFtZSkNCiAgICAgICAgICAoZm9ybWF0 LXJlYWQpDQogICAgICAgICAgKGZyYW1lLWVkZ2VzKQ0KICAgICAgICAgIChmcmluZ2UtbW9kZSkN CiAgICAgICAgICA7OyBnZW9yZ2lhbg0KICAgICAgICAgIDs7IGdyZWVrDQogICAgICAgICAgOzsg aGFpa3Utd2luDQogICAgICAgICAgOzsgaGVicmV3DQogICAgICAgICAgKGhlbHAtcXVpY2spDQog ICAgICAgICAgKGltYWdlLXR5cGUpDQogICAgICAgICAgKGluZGVudC1yZWdpb24pDQogICAgICAg ICAgKGluZGlhbi1jb21wb3NlLXJlZ2V4cCkNCiAgICAgICAgICA7OyBpbmRvbmVzaWFuDQogICAg ICAgICAgKG1zZG9zLXNldHVwLWtleWJvYXJkIHRlcm0vaW50ZXJuYWwpIDs7IGludGVybmFsLmVs biBleGlzdHMNCiAgICAgICAgICAoaXNlYXJjaC1hYm9ydCkNCiAgICAgICAgICAoaXNvLXRyYW5z bC1zZXQtbGFuZ3VhZ2UpDQogICAgICAgICAgOzsgamFwYW5lc2UNCiAgICAgICAgICAoaml0LWxv Y2stbW9kZSkNCiAgICAgICAgICAoamthLWNvbXByLWJ1aWxkLWZpbGUtcmVnZXhwKQ0KICAgICAg ICAgIChrZXltYXAtZ2xvYmFsLXNldCkNCiAgICAgICAgICA7OyBraG1lcg0KICAgICAgICAgIDs7 IGtvcmVhbg0KICAgICAgICAgIDs7IGxhbw0KICAgICAgICAgIChmb3J3YXJkLXNleHApDQogICAg ICAgICAgKGxpc3Atc3RyaW5nLWluLWRvYy1wb3NpdGlvbi1wKQ0KICAgICAgICAgIChscy1saXNw LXNldC1vcHRpb25zIGxzLWxpc3ApIDs7IGxzLWxpc3AuZWxuIGV4aXN0cw0KICAgICAgICAgICht YWNyb2V4cC1jb21waWxpbmctcCkNCiAgICAgICAgICAobWFwLXktb3Itbi1wKQ0KICAgICAgICAg IChtZW51LWZpbmQtZmlsZS1leGlzdGluZykNCiAgICAgICAgICAoY29tcGxldGlvbi1ib3VuZGFy aWVzKQ0KICAgICAgICAgIChlZ3lwdGlhbi1zaGFwZS1ncm91cGluZykNCiAgICAgICAgICAobW91 c2UtZG91YmxlLWNsaWNrLXRpbWUpDQogICAgICAgICAgKGNvbnZlcnQtZGVmaW5lLWNoYXJzZXQt YXJndW1lbnQpDQogICAgICAgICAgKGNvZGluZy1zeXN0ZW0tY2hhbmdlLWVvbC1jb252ZXJzaW9u KQ0KICAgICAgICAgIDs7IG11bGUtY29uZi5lbG4NCiAgICAgICAgICAoc3RvcmUtc3Vic3RyaW5n IG11bGUtdXRpbCkgOzsgbXVsZS11dGlsLmVsbiBleGlzdHMNCiAgICAgICAgICAobW91c2Utd2hl ZWwtY2hhbmdlLWJ1dHRvbikNCiAgICAgICAgICAoYWR2aWNlLWZ1bmN0aW9uLW1hcGMpDQogICAg ICAgICAgKGNvbW1lbnQtc3RyaW5nLXN0cmlwKQ0KICAgICAgICAgIDs7IChucy1oYW5kbGUtbnhv cGVuIHRlcm0vbnMtd2luKQ0KICAgICAgICAgIChvYmFycmF5LW1ha2UpDQogICAgICAgICAgKG9j bG9zdXJlLXR5cGUpDQogICAgICAgICAgKGZvcndhcmQtcGFnZSkNCiAgICAgICAgICAoc2VudGVu Y2UtZW5kKQ0KICAgICAgICAgIChzaG93LXBhcmVuLWZ1bmN0aW9uKQ0KICAgICAgICAgIDs7ICht c2Rvcy1mYWNlLXNldHVwIHRlcm0vcGMtd2luKQ0KICAgICAgICAgIChwZ3RrLWRuZC1pbml0LWZy YW1lIHBndGstZG5kKSA7OyBwZ3RrLWRuZC5lbG4gZXhpc3RzDQogICAgICAgICAgOzsgKHBndGst ZHJhZy1uLWRyb3AgdGVybS9wZ3RrLXdpbikNCiAgICAgICAgICA7OyBwaGlsaXBwaW5lDQogICAg ICAgICAgKHByb2ctY29udGV4dC1tZW51KQ0KICAgICAgICAgIChyZWdleHAtb3B0KQ0KICAgICAg ICAgIChnZXQtcmVnaXN0ZXIpDQogICAgICAgICAgKHF1ZXJ5LXJlcGxhY2UtZGVzY3IpDQogICAg ICAgICAgKHJmbi1lc2hhZG93LXNldHVwLW1pbmlidWZmZXIpDQogICAgICAgICAgKHJlYWQtbXVs dGlwbGUtY2hvaWNlKQ0KICAgICAgICAgIDs7IHJvbWFuaWFuDQogICAgICAgICAgKHNjcm9sbC1i YXItc2NhbGUpDQogICAgICAgICAgKGd1aS1zZWxlY3QtdGV4dCkNCiAgICAgICAgICAoc2VxLWZp cnN0KQ0KICAgICAgICAgIChoYWNrLXJlYWQtc3ltYm9sLXNob3J0aGFuZHMpDQogICAgICAgICAg KG5leHQtZXJyb3ItZmluZC1idWZmZXIpDQogICAgICAgICAgOzsgc2luaGFsYQ0KICAgICAgICAg IDs7IHNsb3Zhaw0KICAgICAgICAgIChleGl0LXNwbGFzaC1zY3JlZW4pDQogICAgICAgICAgKGJ1 ZmZlci1sb2NhbC1ib3VuZHApDQogICAgICAgICAgKHN5bnRheC1wcm9wZXJ0aXplLW11bHRpbGlu ZSkNCiAgICAgICAgICAodGFiLWJhci1tb2RlKQ0KICAgICAgICAgICh0YWJ1bGF0ZWQtbGlzdC1w dXQtdGFnKQ0KICAgICAgICAgIDs7IHRhaS12aWV0DQogICAgICAgICAgKHRleHQtbW9kZSkNCiAg ICAgICAgICA7OyB0aGFpDQogICAgICAgICAgOzsgdGliZXRhbg0KICAgICAgICAgICh0aW1lci1h Y3RpdmF0ZSkNCiAgICAgICAgICAodG9vbC1iYXItbW9kZSkNCiAgICAgICAgICAodG9vbHRpcC1t b2RlKQ0KICAgICAgICAgICh0dHktY29sb3ItZGVzYykNCiAgICAgICAgICAodWNzLW5vcm1hbGl6 ZS1oZnMtbmZkLWNvbXAtcCB1Y3Mtbm9ybWFsaXplKSA7OyB1Y3Mtbm9ybWFsaXplLmVsbiBleGlz dHMNCiAgICAgICAgICAodW5pcXVpZnktaXRlbS1wKQ0KICAgICAgICAgIDs7IHV0Zi04LWxhbmcu ZWxuDQogICAgICAgICAgKHZjLW1vZGUpDQogICAgICAgICAgKGVtYWNzLXZlcnNpb24pDQogICAg ICAgICAgOzsgdmlldG5hbWVzZQ0KICAgICAgICAgIDs7ICh3MzItc2hlbGwtbmFtZSkNCiAgICAg ICAgICA7OyB3MzItdmFycy5lbG4NCiAgICAgICAgICA7OyAodzMyLWhhbmRsZS1kcm9wcGVkLWZp bGUgJ3Rlcm0vdzMyLXdpbikNCiAgICAgICAgICAoZGVmaW5lLXdpZGdldCkNCiAgICAgICAgICAo d2luZG93LXJpZ2h0KQ0KICAgICAgICAgICh4LWRuZC1pbml0LWZyYW1lKQ0KICAgICAgICAgICh4 LWhhbmRsZS1uby1iaXRtYXAtaWNvbikpKSkNCg0KOzs7IEVSVCB0ZXN0cw0KKGVydC1kZWZ0ZXN0 IDAxLW5hdGl2ZWx5LWNvbXBpbGVkLWZlYXR1cmVzLXBhc3NpbmctYXMtb2YtdjEwICgpDQogICJU aGUgOTQgY2FzZXMgd2hpY2ggcGFzcyBmb3IgdjEwIHBhdGNoIHNlcmllcy4NClRoZXNlIGNhc2Vz IGFyZSB0YWtlbiBmcm9tIC5lbG4gZmlsZXMgdGhhdCBhcmUgbG9jYXRlZCBpbiB0aGUgcHJlbG9h ZGVkDQpkaXJlY3RvcnkgZm9yIG5vbi1HdWl4IEVtYWNzLiINCiAgKGV2YWwtd2hlbi1jb21waWxl DQogICAgKGxldCAoKGNhc2VzIChzZXEtZmlsdGVyIChsYW1iZGEgKHgpDQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKG5vdCAobWVtcSAoY2FkciB4KSAnKG11bGUtdXRpbCB0ZXJtL2lu dGVybmFsIHVjcy1ub3JtYWxpemUpKSkpDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNh c2VzL2Vsbi1pbi1wcmVsb2FkZWQtZGlyKSkpDQogICAgICAoc2hvdWxkLW5vdCAodXRpbHMvcmVw b3J0LWZhaWxpbmctY2FzZXMgY2FzZXMpKSkpKQ0KDQooZXJ0LWRlZnRlc3QgMDItbmF0aXZlbHkt Y29tcGlsZWQtZmVhdHVyZXMtZmFpbGluZy1hcy1vZi12MTAgKCkNCiAgIlRoZSAzIGNhc2VzIHdo aWNoIGZhaWwgZm9yIHYxMCBwYXRjaCBzZXJpZXMgb24gR3VpeCBFbWFjcy4NClRoZXNlIGNhc2Vz IGFyZSB0YWtlbiBmcm9tIC5lbG4gZmlsZXMgdGhhdCBhcmUgbG9jYXRlZCBpbiB0aGUgcHJlbG9h ZGVkDQpkaXJlY3RvcnkgZm9yIG5vbi1HdWl4IEVtYWNzLiINCiAgOmV4cGVjdGVkLXJlc3VsdCAo aWYgKGdldGVudiAiR1VJWF9FTlZJUk9OTUVOVCIpDQogICAgICAgICAgICAgICAgICAgICAgIDpm YWlsZWQNCiAgICAgICAgICAgICAgICAgICAgIDpwYXNzZWQpDQogIChzaG91bGQtbm90DQogICAo ZXZhbC13aGVuLWNvbXBpbGUNCiAgICAgKGxldCAoKGNhc2VzIChzZXEtZmlsdGVyIChsYW1iZGEg KHgpDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtZW1xIChjYWRyIHgpICcobXVs ZS11dGlsIHRlcm0vaW50ZXJuYWwgdWNzLW5vcm1hbGl6ZSkpKQ0KICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY2FzZXMvZWxuLWluLXByZWxvYWRlZC1kaXIpKSkNCiAgICAgICAodXRpbHMv cmVwb3J0LWZhaWxpbmctY2FzZXMgY2FzZXMpKSkpKQ0KDQooZXJ0LWRlZnRlc3QgMDMtc29tZS1m ZWF0dXJlcy1pbi1sYXRlci1sb2FkLXBhdGgtZW50cmllcy1hcmUtc3RpbGwtbmF0aXZlbHktY29t cGlsZWQgKCkNCiAgIlRoZXNlIGNhc2VzIHBhc3MgYXMgb2YgdjEwIG9mIHRoZSBwYXRjaC4NClRo ZXNlIGNhc2VzIHNoYXJlIHRoZSBmYWN0IHRoYXQgdGhlaXIgZGlyZWN0b3J5IGVudHJpZXMgb2Nj dXIgaW4NCnRoZSBgbG9hZC1wYXRoJyBhZnRlciB0aGUgJHByZWZpeC9zaGFyZS9lbWFjcy8kZW1h Y3NfdmVyc2lvbi9saXNwDQplbnRyeS4gIFRoaXMgaXMgc29tZXRoaW5nIHRoZXNlIGNhc2VzIGhh dmUgaW4gY29tbW9uIHdpdGggdGhlDQp0aHJlZSBjYXNlcyB0aGF0IGFyZSBrbm93biB0byBmYWls LCBob3dldmVyLCB1bmxpa2UgdGhlbSB0aGVzZQ0Kc3VjY2VlZCAoaS5lLiwgbmF0aXZlbHktY29t cGlsZWQgdmFyaWFudHMgYXJlIGxvYWRlZCkuIg0KICAoZXZhbC13aGVuLWNvbXBpbGUNCiAgICAo bGV0KiAoKGNhc2VzICcoKGNsLXBvc2l0aW9uIGNsLXNlcSkNCiAgICAgICAgICAgICAgICAgICAg KGZpbmQtbGlicmFyeS1uYW1lIGZpbmQtZnVuYykNCiAgICAgICAgICAgICAgICAgICAgKGxvZy1l ZGl0IGxvZy1lZGl0KSkpDQogICAgICAgICAgIChmYWlsaW5nICh1dGlscy9yZXBvcnQtZmFpbGlu Zy1jYXNlcyBjYXNlcykpDQogICAgICAgICAgIChmZWF0dXJlcy1sb2FkcGF0aC1lbnRyaWVzICht YXBjYXIgIyd1dGlscy9maW5kLWxpYnJhcnktZGlyDQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKG1hcGNhciAjJ2NhZHIgY2FzZXMpKSkNCiAgICAgICAgICAg KGZlYXR1cmVzLWVudHJ5LXBvcyAobWFwY2FyIChsYW1iZGEgKHgpDQogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChjbC1wb3NpdGlvbg0KICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKHV0aWxzL2ZpbmQtbGlicmFyeS1kaXIgKGNhZHIgeCkp DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2FkLXBhdGggOnRl c3QgIydlcXVhbCkpDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjYXNl cykpDQogICAgICAgICAgIChzaGFyZS1lbWFjcy1saXNwLWVudHJ5LXBvcyAoY2wtcG9zaXRpb24g Ii9zaGFyZS9lbWFjcy8yOS4yL2xpc3AiDQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbG9hZC1wYXRoDQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgOnRlc3QgIydzdHJpbmctc3VmZml4LXApKSkNCiAg ICAgIChzaG91bGQtbm90IGZhaWxpbmcpDQogICAgICAoc2hvdWxkLW5vdCAoc2VxLWZpbHRlciAo bGFtYmRhICh4KSAoPCB4IHNoYXJlLWVtYWNzLWxpc3AtZW50cnktcG9zKSkNCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZlYXR1cmVzLWVudHJ5LXBvcykpKSkpDQoNCihlcnQtZGVmdGVz dCAwNC1sb2FkLXBhdGgtb3JkZXItc2hvdWxkLW5vdC1kZXRlcm1pbmUtbmF0aXZlbHktY29tcGls ZWQtc3RhdHVzICgpDQogICJUaGlzIHNlZW1zIGxpa2UgYW4gaW52YXJpYW50IHRoYXQgd291bGQg YmUgdXNlZnVsIHRvIGhhdmUuDQpJdCBpcyB1bmNsZWFyIGlmIHRoaXMgaXMgZ3VhcmFudGVlZCBi eSB1cHN0cmVhbSBFbWFjcywgYnV0DQpvYnNlcnZhdGlvbnMgc2VlbSBjb25zaXN0ZW50IHdpdGgg aXQuIg0KICA6ZXhwZWN0ZWQtcmVzdWx0IChpZiAoZ2V0ZW52ICJHVUlYX0VOVklST05NRU5UIikN CiAgICAgICAgICAgICAgICAgICAgICAgOmZhaWxlZA0KICAgICAgICAgICAgICAgICAgICAgOnBh c3NlZCkNCiAgKGV2YWwtd2hlbi1jb21waWxlDQogICAgKGRlZnZhciBvcmlnaW5hbC1sb2FkLXBh dGggbG9hZC1wYXRoKSkNCiAgKGxldCAoKGZhaWx1cmVzLXByaW9yLXRvLWxvYWQtcGF0aC1zaHVm ZmxlDQogICAgICAgICAoZXZhbC13aGVuLWNvbXBpbGUNCiAgICAgICAgICAgKHV0aWxzL3JlcG9y dC1mYWlsaW5nLWNhc2VzIGNhc2VzL2Vsbi1pbi1wcmVsb2FkZWQtZGlyKSkpDQogICAgICAgIChm YWlsdXJlcy1wb3N0LWxvYWQtcGF0aC1zaHVmZmxlDQogICAgICAgICAoZXZhbC13aGVuLWNvbXBp bGUNCiAgICAgICAgICAgKHByb2duDQogICAgICAgICAgICAgKHNldHEgbG9hZC1wYXRoDQogICAg ICAgICAgICAgICAgICAgKGhhY2svbmV3LWxvYWQtcGF0aC10aGF0LWNhbi1tYWtlLXYxMC10ZXN0 LWZhaWx1cmVzLXBhc3MpKQ0KICAgICAgICAgICAgIChkb2xpc3QgKGl0ZW0gY2FzZXMvZWxuLWlu LXByZWxvYWRlZC1kaXIpDQogICAgICAgICAgICAgICAod2hlbiAoY2FkciBpdGVtKQ0KICAgICAg ICAgICAgICAgICAodW5sb2FkLWZlYXR1cmUgKGNhZHIgaXRlbSkpKSkNCiAgICAgICAgICAgICAo dXRpbHMvcmVwb3J0LWZhaWxpbmctY2FzZXMgY2FzZXMvZWxuLWluLXByZWxvYWRlZC1kaXIpKSkp KQ0KICAgIChzaG91bGQgKGVxdWFsIGZhaWx1cmVzLXByaW9yLXRvLWxvYWQtcGF0aC1zaHVmZmxl DQogICAgICAgICAgICAgICAgICAgZmFpbHVyZXMtcG9zdC1sb2FkLXBhdGgtc2h1ZmZsZSkpKSkN Cg0KKGVydC1kZWZ0ZXN0IDA1LXRoZXJlLWV4aXN0cy1sb2FkLXBhdGgtb3JkZXItd2hlcmUtYWxs LXRlc3RzLXBhc3MgKCkNCiAgIlByb29mIHdpdG5lc3MgdGhhdCB0aGUgdjEwIGZhaWxpbmcgY2Fz ZXMgcmVsYXRlIHRvIGxvYWQtcGF0aCBvcmRlcmluZy4iDQogIChzaG91bGQtbm90IChldmFsLXdo ZW4tY29tcGlsZQ0KICAgICAgICAgICAgICAgICh3aGVuIChhbmQgKGJvdW5kcCAnb3JpZ2luYWwt bG9hZC1wYXRoKSBvcmlnaW5hbC1sb2FkLXBhdGgpDQogICAgICAgICAgICAgICAgICAoc2V0cSBs b2FkLXBhdGggb3JpZ2luYWwtbG9hZC1wYXRoKQ0KICAgICAgICAgICAgICAgICAgKGRvbGlzdCAo aXRlbSBjYXNlcy9lbG4taW4tcHJlbG9hZGVkLWRpcikNCiAgICAgICAgICAgICAgICAgICAgKHdo ZW4gKGNhZHIgaXRlbSkNCiAgICAgICAgICAgICAgICAgICAgICAodW5sb2FkLWZlYXR1cmUgKGNh ZHIgaXRlbSkpKSkpDQogICAgICAgICAgICAgICAgKGRlZnZhciBvcmlnaW5hbC1sb2FkLXBhdGgg bG9hZC1wYXRoKQ0KICAgICAgICAgICAgICAgIChzZXRxIGxvYWQtcGF0aA0KICAgICAgICAgICAg ICAgICAgICAgIChoYWNrL25ldy1sb2FkLXBhdGgtdGhhdC1jYW4tbWFrZS12MTAtdGVzdC1mYWls dXJlcy1wYXNzKSkNCiAgICAgICAgICAgICAgICAodXRpbHMvcmVwb3J0LWZhaWxpbmctY2FzZXMg Y2FzZXMvZWxuLWluLXByZWxvYWRlZC1kaXIpKSkpDQoNCjs7OyB0ZXN0LW5hdGl2ZS1jb21wLXAu ZWwgZW5kcyBoZXJlDQo= --b1_StheWvR7uln40H9UNRpyRThyw7R2pi8tnTZKRRV52FA-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 03:15:31 2024 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 Subject: [PATCH emacs-team v11 3/7] gnu: emacs: Check integrity of native-compiled files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 03:15:35 2024 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 Subject: [PATCH emacs-team v11 7/7] gnu: emacs-magit: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 03:22:24 2024 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 Subject: [PATCH emacs-team v11 6/7] gnu: emacs-org: Fix native builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(+) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.67 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.67 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(+) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.67 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 03:22:30 2024 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 Subject: [PATCH emacs-team v11 2/7] gnu: emacs: Don't hash file names in native compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 inserti [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.195 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.195 listed in list.dnswl.org] 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 inserti [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.195 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.195 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 03:23:06 2024 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 Subject: [PATCH emacs-team v11 1/7] gnu: emacs: Build trampolines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 03:24:09 2024 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:24:09 +0000 Received: from localhost ([127.0.0.1]:37621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnKH-0006Q3-B2 for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:24:08 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:52596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnKE-0006P3-1b for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:24:03 -0500 Received: by mail-lj1-f194.google.com with SMTP id 38308e7fff4ca-2d2305589a2so21283181fa.1 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708762952; x=1709367752; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=SC7d+z/0/O0iI5S/AaEiGcIUuHIG5qxFPmpdsryCWe8=; b=kyafznPI0nCW0jcyJMycDDbxWRHycUDqjFB0ChKkdCYhZ7OeAINdlQO9RR7e9Tajsn kIfuNjP3i2NtUN9T4TKx/yKuo/yvB3mbKR6fTpUckm3m66aCqaS39aFCI9Tg7b3KlY0s +xYtFBWMxR2ZM2YpHI/STXiOA+N1mFBm7fQqXp7YDK/JdPhiebSKdrDQ5WdClmQ7lRWZ OimsU8ibfI8CdJXqVsjf8Mwy1j58DPIiMRQRLvWt0MQNxlQn2g7CXoqlyBzZckJYbRlc CA0Gh43af4oBRQjmXuSdwUqXsbmvrW0FW1f7egtSDHglbyYn6Oh3/KkfYqjs+tp4GGwd e8MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708762952; x=1709367752; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SC7d+z/0/O0iI5S/AaEiGcIUuHIG5qxFPmpdsryCWe8=; b=N/c1Gt2YFQKjpjOVIoAIQTDz5lDCcagcY6KRO+MVnwjlCpU7f8Z2PbSsJ/au0LxbTT XCzxiLRcWw63KQKvpRypo9xX2ZTOA74b+494cXIC2uaj0wIJg00B5IcG0wivW3wc6bcf FIsw5y7Um/RAgfM1vhE1AMRmXgFA0PNo9jeQCIcD/Y+uqKdtvbYSi01288TmGT1iiQ9o Tj2SY3ZByoNjGK+TGss9LPhtiixi4qVc9O36YhwmukavW4REJ2avXj2Dhe/4iYJMn9NF g8OpVNE7wkgrD39vGJF1NAYdBtrGHgM+GKkcFUy4xbNDWrGtoXaCQIeDX7ew10mLTdkO FLIw== X-Gm-Message-State: AOJu0Yz4L15WN4xor13mJQVvSkd5b7D3reujRd/l5HJ7WgHEu29EnZJR nfnhwphE0bjzeBujKw6phxgMJqeY8B+QhSGgey6/wgJgKYInJE0wPUCyIDHCMdo= X-Google-Smtp-Source: AGHT+IGiz5K/oF1gkl3Miov0TMb/fztVgvG8DjswScYPa3tw5pYEDtbOQQMtf8SaWSCBjji+WjRiDA== X-Received: by 2002:aa7:d746:0:b0:565:b4ca:72f2 with SMTP id a6-20020aa7d746000000b00565b4ca72f2mr123831eds.34.1708762435629; Sat, 24 Feb 2024 00:13:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:13:55 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Sat, 24 Feb 2024 09:04:23 +0100 Subject: [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: After a week of debugging the internals of how Emacs compiles, loads, and dumps (!) its .eln-files, I finally came up with the perfectly cursed mix that enables us to actually load *and* graft our nat [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.208.194 listed in bl.score.senderscore.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.194 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.194 listed in wl.mailspike.net] 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) After a week of debugging the internals of how Emacs compiles, loads, and dumps (!) its .eln-files, I finally came up with the perfectly cursed mix that enables us to actually load *and* graft our natively compiled packages with ease. In unrelated news, I feel like I should wear a witch hat for faster development cycles. Liliana Marie Prikler (7): gnu: emacs: Build trampolines. gnu: emacs: Don't hash file names in native compilation. gnu: emacs: Check integrity of native-compiled files. gnu: emacs: Disable jit compilation. build-system: emacs: Compute relative file names. gnu: emacs-org: Fix native builds. gnu: emacs-magit: Fix native builds. Makefile.am | 1 + gnu/local.mk | 2 + .../aux-files/emacs/comp-integrity.el | 126 +++++++ gnu/packages/emacs-xyz.scm | 10 +- gnu/packages/emacs.scm | 20 +- .../emacs-disable-jit-compilation.patch | 19 + .../emacs-native-comp-fix-filenames.patch | 338 ++++++++++++++++++ guix/build/emacs-utils.scm | 4 +- 8 files changed, 516 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/aux-files/emacs/comp-integrity.el create mode 100644 gnu/packages/patches/emacs-disable-jit-compilation.patch create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 03:24:16 2024 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 Subject: [PATCH emacs-team v11 4/7] gnu: emacs: Disable jit compilation. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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. [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.68 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.68 listed in wl.mailspike.net] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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. [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.68 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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"); -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 03:40:27 2024 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 Subject: [PATCH emacs-team v11 5/7] build-system: emacs: Compute relative file names. X-Debbugs-Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com to: 67260@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.68 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.68 listed in wl.mailspike.net] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 67260 Cc: Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.68 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 MALFORMED_FREEMAIL Bad headers on message from free email service -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 01 12:36:50 2024 Received: (at 67260) by debbugs.gnu.org; 1 Mar 2024 17:36:50 +0000 Received: from localhost ([127.0.0.1]:37374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rg6oT-0002UY-0i for submit@debbugs.gnu.org; Fri, 01 Mar 2024 12:36:50 -0500 Received: from mail-40136.proton.ch ([185.70.40.136]:50335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rg6oO-0002UH-12 for 67260@debbugs.gnu.org; Fri, 01 Mar 2024 12:36:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1709314568; x=1709573768; bh=DRj2aCxd9TVmQBuR/jNmmLwajH61qp+31hbarIWv26g=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=HkAtISFAtpumaxJKzehFsx26RRSxuwpB1L70neBeiwdmXmwos3g/qOoNqsqIm/66A cnoISoEwxjsXOz3V6a+pWTQH/5efWbOA26qaRBI5JgWhEiULdBQjO3ccQI6TctzJCA sjOYYM5sEU3tLK7GKST6t82wkKI+qGB9VVYaAb8GLfbBwaKKZcxpTo6EsNmkx2iIbw FImCa6MxQpfZ78MJ3Jsmae1G9tbuveAKAipmo7Utev19vLFKZ1RXvxVlFuFaekWt59 6GFI1b6adm9jRGac4xRcBTfKxcQ7mhMstTp5U3I1UwyWhSrHpn2kHJfntUkKkiafx8 aGjqFoMfC5LYw== Date: Fri, 01 Mar 2024 17:35:59 +0000 To: Liliana Marie Prikler From: Suhail Subject: Re: [bug#67260] [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! Message-ID: <878r31onwr.fsf@bayesians.ca> Feedback-ID: 38691229:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, 67260@debbugs.gnu.org, Suhail , andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Liliana Marie Prikler writes: > I finally came up with the perfectly cursed mix that enables us to > actually load *and* graft our natively compiled packages with ease. I can confirm that all the features being checked show up as natively compiled as default - yay! However, there seems to be some brittleness in whether or not natively-compiled versions can be located. Specifically, by reordering the entries of the load-path, unloading previously loaded features, and then reloading them some features will be reported as being byte-compiled instead of natively-compiled. Is my expectation that reordering entries in the load-path shouldn't affect the natively-compiled status misplaced? >From the previously shared test script, cases 01, 02, 03 pass now. However, case 04-load-path-order-should-not-determine-natively-compiled-status still fails. Where in v10 it failed because 3 features previously reported as being byte-compiled became natively-compiled, now it fails because the same 3 features go from being natively-compiled to byte-compiled after reordering load-path. The features in question are the same ones that were problematic in v10: - term/internal - mule-util - ucs-normalize My opinion: v11 seems to be an improvement over v10. While I don't believe that v11 is free of *all* bugs, I don't believe that that should be a necessary pre-requisite before merging in. I believe it would be beneficial to merge v11 into emacs-team soon(ish) and for the emacs-team branch to be merged into master soon thereafter. A separate bug issue can be created to track the peculiar dependence of the native-compilation status on the ordering of entries in load-path. Thoughts? --=20 Suhail From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 01 14:42:19 2024 Received: (at 67260-done) by debbugs.gnu.org; 1 Mar 2024 19:42:19 +0000 Received: from localhost ([127.0.0.1]:37514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rg8lv-0005x4-0x for submit@debbugs.gnu.org; Fri, 01 Mar 2024 14:42:19 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:44259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rg8ls-0005wq-86 for 67260-done@debbugs.gnu.org; Fri, 01 Mar 2024 14:42:16 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a26fa294e56so471097466b.0 for <67260-done@debbugs.gnu.org>; Fri, 01 Mar 2024 11:41:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709322042; x=1709926842; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=ujUB2lPdGsi381ygIEDMGB5+2JshD767tHcMThqzZqM=; b=euhUXLxeNHNo4W+WEk8XVMRRg9Sze0Sos24WWAMHRbGlV8+vdztoh27fBldacvPhJW DnUpH9KPVTN2dW42jlM/t3kUYW/tgIsfIsVMRXh38EOviTB8/M7b4wIj8y6FZ1EceMUR bFaeFsAjhJT+hPHS74dxGv61/euUmk+6eDuh9NieB2E/t27RnTHQhPRwTyU8eQI5FYU0 xkddTF9LIiArZtphTqFPdnxMxxKOtYzOE6OMd/PuREo52w0B+QdtiaRtYp/wV1x+tdFm 1vPaLYxmaZF9ImWoOoJHktDbNJfWnKJ7MbnoIY0vus6N/tPM55+zZJad9D1vSgVfQYZV vpSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709322042; x=1709926842; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ujUB2lPdGsi381ygIEDMGB5+2JshD767tHcMThqzZqM=; b=LEFj60rCbssuMRt/pdBNe3F1YqqTU16lMScu2yZa7AE3b/D/PNiI7bZWTJmaIFa+NA P90AcdBPHBdjK5vAWn965yF66zYdHawHtHbmIBVEdxlId49+NklyHIagL+x4Z+s//tQ0 ZdISKYqTwiQ3fQZkwjm6IQhe+1sbn13qLYDfIEhiFctmE8WbHLuNzMRYYs1YrDGb4b3C +kfM1hOLiYCip1O7f9rKLRlVRanIyBQUX16XiqajkIWB23AfFrGd5uIVj9D44uGaQbWa 9i9pGMT1rlP+5FYnAhlAZ60vDtYGH5Zu9g1zC6d2oa0Bc1cxuYYfU0NW/WlXRDdywxtE G7ZQ== X-Gm-Message-State: AOJu0Yz9g/vdcnvgpmkFEtgqgecHPq7LBqJH2uGm0F1vAwvtuXlYYzXM TdAvpr5fFpQLsfIbZ36ErhaVBKyDy/3supgF/UTFNDHaBsV9PgKP X-Google-Smtp-Source: AGHT+IFmfdhzFdYadRY5ncu5e7aWYILCln59XeJiGBl8HA28U7oUP3rAr/gMxG3vytpkwJ3F4Q07Eg== X-Received: by 2002:a17:906:5953:b0:a44:b90b:3262 with SMTP id g19-20020a170906595300b00a44b90b3262mr992688ejr.5.1709322042058; Fri, 01 Mar 2024 11:40:42 -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 p16-20020a170906229000b00a442979e5e5sm1963404eja.220.2024.03.01.11.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 11:40:41 -0800 (PST) Message-ID: Subject: Re: [bug#67260] [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! From: Liliana Marie Prikler To: Suhail Date: Fri, 01 Mar 2024 20:40:38 +0100 In-Reply-To: <878r31onwr.fsf@bayesians.ca> References: <878r31onwr.fsf@bayesians.ca> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260-done Cc: cox.katherine.e+guix@gmail.com, 67260-done@debbugs.gnu.org, andrew@trop.in X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 01.03.2024 um 17:35 +0000 schrieb Suhail: > Is my expectation that reordering entries in the load-path shouldn't > affect the natively-compiled status misplaced? Yes. We take the first prefix match and compute the file names from there. This is consistent with emacs matching the first file it finds on the load-path. You can't do much better, because your load path may only be partially specified at compile time and later expanded with normal-top-level-add-to-load-path. > Where in v10 it failed because 3 features previously reported as > being byte-compiled became natively-compiled, now it fails because > the same 3 features go from being natively-compiled to byte-compiled > after reordering load-path. The expectation that load-path order does not matter is imho quite unfounded. Note that we do ship the actually important test cases with v11. > A separate bug issue can be created to track the peculiar dependence > of the native-compilation status on the ordering of entries in load- > path. Well, to me it's not peculiar as I wrote the code, but I'm not sure how familiar you are with Emacs' internals. If you feel up for it, go for it, but I'd rather tackle other problems related to our emacs ecosystem. Anyway, as you said, I'm pushing this now so that we can do a double merge dance (i.e. master =E2=86=92 emacs-team, then request the other way) starting early tomorrow. Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 04 02:15:11 2024 Received: (at 67260) by debbugs.gnu.org; 4 Mar 2024 07:15:11 +0000 Received: from localhost ([127.0.0.1]:41670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rh2XW-0003Mb-S1 for submit@debbugs.gnu.org; Mon, 04 Mar 2024 02:15:11 -0500 Received: from out-178.mta1.migadu.com ([95.215.58.178]:56993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rh2XT-0003Lk-1J for 67260@debbugs.gnu.org; Mon, 04 Mar 2024 02:15:09 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1709536439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Zx5laWGufmeqwR3wl+lLFVWw48vjLM+DI5ERO4lQ//Q=; b=Kk/0V2/WRip3WRN3XLBtNE2zM/3cuAY2kuw62/UQKuaHJ44I7sEbBLV6nJbpfMUYrgZCTP UjzGFCB0v5AfyWDEzVQEl8IG7BcNzRFj8bkrBkgAoZmo/0pYs8QOGDJQRI0bOyQETGaTXc Sa/HBYD+FsL9JULSKwxNffEciqbDucTIAa7bKFnIuQv34kkVytfQrgq0XgeCaH2w/VRHBL jGsYvqsHA8g2CK/HmGlcym1GXDBd/sLXyVW03hkJ2R73k4ifUE5LC/zH6JPqReboZy7BRV vlQBw2zp8ZyYcBGufqVyX2+xygHCnkpvnw+x0nli+3hNDqX3uwe5fM0Q2Eu0/w== From: Andrew Tropin To: Liliana Marie Prikler , 67260@debbugs.gnu.org Subject: Re: [bug#67260] [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! In-Reply-To: References: Date: Mon, 04 Mar 2024 10:13:54 +0300 Message-ID: <87il22bhal.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-02-24 09:04, Liliana Marie Prikler wrote: > After a week of debugging the internals of how Emacs compiles, loads, > and dumps (!) its .eln-files, I finally came up with the perfectly > cursed mix that enables us to actually load *and* graft our natively > compiled packages with ease. > > In unrelated news, I feel like I should wear a witch hat for faster > development cycles. > > Liliana Marie Prikler (7): > gnu: emacs: Build trampolines. > gnu: emacs: Don't hash file names in native compilation. > gnu: emacs: Check integrity of native-compiled files. > gnu: emacs: Disable jit compilation. > build-system: emacs: Compute relative file names. > gnu: emacs-org: Fix native builds. > gnu: emacs-magit: Fix native builds. > > Makefile.am | 1 + > gnu/local.mk | 2 + > .../aux-files/emacs/comp-integrity.el | 126 +++++++ > gnu/packages/emacs-xyz.scm | 10 +- > gnu/packages/emacs.scm | 20 +- > .../emacs-disable-jit-compilation.patch | 19 + > .../emacs-native-comp-fix-filenames.patch | 338 ++++++++++++++++++ > guix/build/emacs-utils.scm | 4 +- > 8 files changed, 516 insertions(+), 4 deletions(-) > create mode 100644 gnu/packages/aux-files/emacs/comp-integrity.el > create mode 100644 gnu/packages/patches/emacs-disable-jit-compilation.pa= tch > create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.= patch > > > base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 For usual emacs it seems to work, (require 'magit) with clean eln cache doesn't trigger any builds. For emacs-pgtk it fails to build emacs: guix time-machine --url=3D'https://git.guix-patches.cbaines.net/git/guix-pa= tches' --branch=3Dissue-67260 --disable-authentication -- shell emacs-pgtk = emacs-magit --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q =2D-8<---------------cut here---------------start------------->8--- passed 94/97 expect-window-right-native (0.002412 sec) Test expect-x-dnd-init-frame-native backtrace: signal(void-function (x-dnd-init-frame)) apply(signal (void-function (x-dnd-init-frame))) (setq value-477 (apply fn-475 args-476)) (unwind-protect (setq value-477 (apply fn-475 args-476)) (setq form- (if (unwind-protect (setq value-477 (apply fn-475 args-476)) (setq f (let (form-description-479) (if (unwind-protect (setq value-477 (app (let ((value-477 'ert-form-evaluation-aborted-478)) (let (form-descr (let* ((fn-475 #'eq) (args-476 (condition-case err (let ((signal-hoo (lambda nil (let* ((fn-475 #'eq) (args-476 (condition-case err (let=20 ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test ert-run-test(#s(ert-test :name expect-x-dnd-init-frame-native :docum ert-run-or-rerun-test(#s(ert--stats :selector t :tests ... :test-map ert-run-tests(t #f(compiled-function (event-type &rest event-args) # ert-run-tests-batch(nil) ert-run-tests-batch-and-exit() command-line-1(("--load" "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3 command-line() normal-top-level() Test expect-x-dnd-init-frame-native condition: (void-function x-dnd-init-frame) FAILED 95/97 expect-x-dnd-init-frame-native (0.000082 sec) at ../../..= /gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-integrity.el:1 Test expect-x-handle-no-bitmap-icon-native backtrace: signal(void-function (x-handle-no-bitmap-icon)) apply(signal (void-function (x-handle-no-bitmap-icon))) (setq value-482 (apply fn-480 args-481)) (unwind-protect (setq value-482 (apply fn-480 args-481)) (setq form- (if (unwind-protect (setq value-482 (apply fn-480 args-481)) (setq f (let (form-description-484) (if (unwind-protect (setq value-482 (app (let ((value-482 'ert-form-evaluation-aborted-483)) (let (form-descr (let* ((fn-480 #'eq) (args-481 (condition-case err (let ((signal-hoo (lambda nil (let* ((fn-480 #'eq) (args-481 (condition-case err (let=20 ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test ert-run-test(#s(ert-test :name expect-x-handle-no-bitmap-icon-native ert-run-or-rerun-test(#s(ert--stats :selector t :tests ... :test-map ert-run-tests(t #f(compiled-function (event-type &rest event-args) # ert-run-tests-batch(nil) ert-run-tests-batch-and-exit() command-line-1(("--load" "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3 command-line() normal-top-level() Test expect-x-handle-no-bitmap-icon-native condition: (void-function x-handle-no-bitmap-icon) FAILED 96/97 expect-x-handle-no-bitmap-icon-native (0.000111 sec) at .= ./../../gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-integrity.el:1 passed 97/97 expect-x-setup-function-keys-native (0.004165 sec) Ran 97 tests, 95 results as expected, 2 unexpected (2024-03-02 05:46:28+000= 0, 0.361428 sec) 2 unexpected results: FAILED expect-x-dnd-init-frame-native FAILED expect-x-handle-no-bitmap-icon-native error: in phase 'validate-comp-integrity': uncaught exception: %exception #<&invoke-error program: "/gnu/store/m01icx06dw1vs1krcj4jbmw71nv= 430dp-emacs-pgtk-29.2/bin/emacs" arguments: ("--batch" "--load" "/gnu/store= /ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-integrity.el" "-f" "ert-run-tests-ba= tch-and-exit") exit-status: 1 term-signal: #f stop-signal: #f>=20 phase `validate-comp-integrity' failed after 0.5 seconds command "/gnu/store/m01icx06dw1vs1krcj4jbmw71nv430dp-emacs-pgtk-29.2/bin/em= acs" "--batch" "--load" "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-i= ntegrity.el" "-f" "ert-run-tests-batch-and-exit" failed with status 1 =2D-8<---------------cut here---------------end--------------->8--- Thank you very much for working on it! =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmXldLIACgkQIgjSCVjB 3rC+1Q//X3JpdkDsnwKiPL2JtQfvM752bc4j6yzbfagzL5wIRlgIQOx/85l7mAvR PPYv5oJHylThpFmSc0DztbqiHBpy/g0bPonTglzD6ojcCcIteBjP2mSCIiYMut0r qdUIADt3D5KRpqIRz4nFzyxes4qvEPJTELa4IYe2S8qWtLGBek7lXtuTIwOi3q8P tcVezQ2SqwHnxLKyCCVRYprtkFW+NlYwSzlds1Xb6dR8JoscRONR0J6jEjkqgBiV nwvUYz9YsdWf7dEKm6pVrRyGRih9Zje0npY4AAF1SHS2PLcD7ybQY9dN1flC0jiQ R1BZ9JRTSpD7wefUR3533ofTIGnRWa7U/wWiAeWNLmHHnlwqshoiN6uW0YVowxs4 g/7WgwUJaLc4PRbhoBOOczIZTDLFSUUI+ivPtDmQYLls46ob5TxwHJ3Xms/6EAxo KWPQjKlgaMSASPtAr0Sl4Of0JxWgToPKdKQSjggjmYpjamyvF+/wObgOleU6ZEKz G3qGD3oglC4weh9mKo9FjMqlh0D1bd+RMpABYjn7+QayPuwLAGoZwPH52RtOp2Rc svTjp5Go2wk4rVEgRk7JPyMPSh1iDtBRaxYLIBFus2h5vhJbBawV9VCUdeGajTIM 8VbgQmAZvrQbBIBZ3n9fSV9aQfM4HuBEZzYuHVwgwT+w5C/23i4= =DpsA -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 04 15:01:12 2024 Received: (at 67260) by debbugs.gnu.org; 4 Mar 2024 20:01:12 +0000 Received: from localhost ([127.0.0.1]:44982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhEUp-0000JO-KE for submit@debbugs.gnu.org; Mon, 04 Mar 2024 15:01:12 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:53351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhEUo-0000JA-96 for 67260@debbugs.gnu.org; Mon, 04 Mar 2024 15:01:11 -0500 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a458b6d9cfeso78607866b.2 for <67260@debbugs.gnu.org>; Mon, 04 Mar 2024 12:00:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709582375; x=1710187175; darn=debbugs.gnu.org; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:from:to:cc:subject:date:message-id:reply-to; bh=lHGaixC8GpoQ+129rwYCQcmWZPfNXK8+gR1IM5lMbPU=; b=PSEdMzoNYZeuGFq2R0p0YxoGYh6JH0DtCQE75/r4RE63ROLmZO7TRGEXKzmCE+eokN hSkus/VNOU17+QiFV5rCS0Cvbvk6pR7anHFjqHdMTNr6/tN1SNDNV719lEvEjW/2X0lX 9qudy+07FEV939sVpfi1lJ2ciENw4itsEsf0WHcHIwWp9ahsDjz67q1ImhLud2mH28CF kr/7CuInQMxGsgqdBg4I3zuWNqeqeBP0PiDHqj2D8COj4t/xfBnrw0KlRIu/69PjC+aq QKeZro290hWiBx2jscxGuJzLyAlwSWAwyBmNpHhi8d0QCBkirRhspRTwlcKYPRNmpXSN wiwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709582375; x=1710187175; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lHGaixC8GpoQ+129rwYCQcmWZPfNXK8+gR1IM5lMbPU=; b=eWLgREdbHwoiiLZ3u/IyOBW3uYxtdlrXrPsvyRFeUThnclrZAHamqjLiyB+R9ORmOb ariULjKUJyzBReqtRPzaT2ZPX1pJw6zHpOtY7TLi9MruwYc6UrTjm4n6t5+yBlPSNfVF JL8yWnezx+eEma8vIgbUEqsFzTHeDLuhRIV33cdt2TvU8UovrXtIxoZ+p3qVafABhb5c RuE4kTcFq7/DNpr8FNJ9ob6T6IVrFX2/eom4n4JMznK5WPEe+Usi9iU2aluc8ZR2bavK /Fu7F1lRXi5EAaJF+MTnaXTIp1A6whLBp58udyl/38Pp/wex7xJP9mYAHpun672WkYIJ npzA== X-Forwarded-Encrypted: i=1; AJvYcCUgYY6aNEJQePYyH/y2rI7WKmBYZJ5vR+Xid6silPgZ5MVoRcUxV+eXQ7D/i4vmJOPD+dtzNmlHZ2yDs0SsViCDE/U5IsA= X-Gm-Message-State: AOJu0YyPjkjTRYo0OnBAGUcKJNzqo5Jf41H+9mAUNTiIHwCYf1tnVcwR eQhY47BjinOxfcr1Xik5sKSHjp750hnq1/UCdVnACYygDEo+BKcu X-Google-Smtp-Source: AGHT+IHBTBa6R95aY7n6P1fFD4sYiaflSvtP3dPd8O4HRCjySbYkG4CuQAMG67UMKUhLF4vr4NJciQ== X-Received: by 2002:a17:906:b00c:b0:a44:c1a9:ee37 with SMTP id v12-20020a170906b00c00b00a44c1a9ee37mr5731253ejy.61.1709582374449; Mon, 04 Mar 2024 11:59:34 -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 z19-20020a170906075300b00a44cf710cc3sm3203178ejb.182.2024.03.04.11.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 11:59:34 -0800 (PST) Message-ID: <6eb2791017ee33d78afc480d9aa68498c1c5a8c1.camel@gmail.com> Subject: Re: [bug#67260] [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! From: Liliana Marie Prikler To: Andrew Tropin , 67260@debbugs.gnu.org Date: Mon, 04 Mar 2024 20:59:32 +0100 In-Reply-To: <87il22bhal.fsf@trop.in> References: <87il22bhal.fsf@trop.in> Content-Type: multipart/mixed; boundary="=-Ldn0F9+yx8pWgleDiQ7g" User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@gmail.com, Suhail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-Ldn0F9+yx8pWgleDiQ7g Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Am Montag, dem 04.03.2024 um 10:13 +0300 schrieb Andrew Tropin: > On 2024-02-24 09:04, Liliana Marie Prikler wrote: >=20 > > After a week of debugging the internals of how Emacs compiles, > > loads, > > and dumps (!) its .eln-files, I finally came up with the perfectly > > cursed mix that enables us to actually load *and* graft our > > natively > > compiled packages with ease. > >=20 > > In unrelated news, I feel like I should wear a witch hat for faster > > development cycles. > >=20 > > Liliana Marie Prikler (7): > > =C2=A0 gnu: emacs: Build trampolines. > > =C2=A0 gnu: emacs: Don't hash file names in native compilation. > > =C2=A0 gnu: emacs: Check integrity of native-compiled files. > > =C2=A0 gnu: emacs: Disable jit compilation. > > =C2=A0 build-system: emacs: Compute relative file names. > > =C2=A0 gnu: emacs-org: Fix native builds. > > =C2=A0 gnu: emacs-magit: Fix native builds. > >=20 > > =C2=A0Makefile.am=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= |=C2=A0=C2=A0 1 + > > =C2=A0gnu/local.mk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |= =C2=A0=C2=A0 2 + > > =C2=A0.../aux-files/emacs/comp-integrity.el=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 | 126 +++++++ > > =C2=A0gnu/packages/emacs-xyz.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= |=C2=A0 10 +- > > =C2=A0gnu/packages/emacs.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 |=C2=A0 20 +- > > =C2=A0.../emacs-disable-jit-compilation.patch=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 |=C2=A0 19 + > > =C2=A0.../emacs-native-comp-fix-filenames.patch=C2=A0=C2=A0=C2=A0=C2=A0= | 338 > > ++++++++++++++++++ > > =C2=A0guix/build/emacs-utils.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= |=C2=A0=C2=A0 4 +- > > =C2=A08 files changed, 516 insertions(+), 4 deletions(-) > > =C2=A0create mode 100644 gnu/packages/aux-files/emacs/comp-integrity.el > > =C2=A0create mode 100644 gnu/packages/patches/emacs-disable-jit- > > compilation.patch > > =C2=A0create mode 100644 gnu/packages/patches/emacs-native-comp-fix- > > filenames.patch > >=20 > >=20 > > base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 >=20 > For usual emacs it seems to work, (require 'magit) with clean eln > cache > doesn't trigger any builds. For emacs-pgtk it fails to build emacs: >=20 > guix time-machine -- > url=3D'https://git.guix-patches.cbaines.net/git/guix-patches'=C2=A0-- > branch=3Dissue-67260 --disable-authentication -- shell emacs-pgtk > emacs-magit --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q >=20 > --8<---------------cut here---------------start------------->8--- > =C2=A0=C2=A0 passed=C2=A0 94/97=C2=A0 expect-window-right-native (0.00241= 2 sec) > Test expect-x-dnd-init-frame-native backtrace: > =C2=A0 signal(void-function (x-dnd-init-frame)) > =C2=A0 apply(signal (void-function (x-dnd-init-frame))) > =C2=A0 (setq value-477 (apply fn-475 args-476)) > =C2=A0 (unwind-protect (setq value-477 (apply fn-475 args-476)) (setq > form- > =C2=A0 (if (unwind-protect (setq value-477 (apply fn-475 args-476)) (setq > f > =C2=A0 (let (form-description-479) (if (unwind-protect (setq value-477 > (app > =C2=A0 (let ((value-477 'ert-form-evaluation-aborted-478)) (let (form- > descr > =C2=A0 (let* ((fn-475 #'eq) (args-476 (condition-case err (let ((signal- > hoo > =C2=A0 (lambda nil (let* ((fn-475 #'eq) (args-476 (condition-case err (le= t > =C2=A0 ert--run-test-internal(#s(ert--test-execution-info :test #s(ert- > test > =C2=A0 ert-run-test(#s(ert-test :name expect-x-dnd-init-frame-native > :docum > =C2=A0 ert-run-or-rerun-test(#s(ert--stats :selector t :tests ... :test- > map > =C2=A0 ert-run-tests(t #f(compiled-function (event-type &rest event-args) > # > =C2=A0 ert-run-tests-batch(nil) > =C2=A0 ert-run-tests-batch-and-exit() > =C2=A0 command-line-1(("--load" > "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3 > =C2=A0 command-line() > =C2=A0 normal-top-level() > Test expect-x-dnd-init-frame-native condition: > =C2=A0=C2=A0=C2=A0 (void-function x-dnd-init-frame) > =C2=A0=C2=A0 FAILED=C2=A0 95/97=C2=A0 expect-x-dnd-init-frame-native (0.0= 00082 sec) at > ../../../gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp- > integrity.el:1 > Test expect-x-handle-no-bitmap-icon-native backtrace: > =C2=A0 signal(void-function (x-handle-no-bitmap-icon)) > =C2=A0 apply(signal (void-function (x-handle-no-bitmap-icon))) > =C2=A0 (setq value-482 (apply fn-480 args-481)) > =C2=A0 (unwind-protect (setq value-482 (apply fn-480 args-481)) (setq > form- > =C2=A0 (if (unwind-protect (setq value-482 (apply fn-480 args-481)) (setq > f > =C2=A0 (let (form-description-484) (if (unwind-protect (setq value-482 > (app > =C2=A0 (let ((value-482 'ert-form-evaluation-aborted-483)) (let (form- > descr > =C2=A0 (let* ((fn-480 #'eq) (args-481 (condition-case err (let ((signal- > hoo > =C2=A0 (lambda nil (let* ((fn-480 #'eq) (args-481 (condition-case err (le= t > =C2=A0 ert--run-test-internal(#s(ert--test-execution-info :test #s(ert- > test > =C2=A0 ert-run-test(#s(ert-test :name expect-x-handle-no-bitmap-icon- > native > =C2=A0 ert-run-or-rerun-test(#s(ert--stats :selector t :tests ... :test- > map > =C2=A0 ert-run-tests(t #f(compiled-function (event-type &rest event-args) > # > =C2=A0 ert-run-tests-batch(nil) > =C2=A0 ert-run-tests-batch-and-exit() > =C2=A0 command-line-1(("--load" > "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3 > =C2=A0 command-line() > =C2=A0 normal-top-level() > Test expect-x-handle-no-bitmap-icon-native condition: > =C2=A0=C2=A0=C2=A0 (void-function x-handle-no-bitmap-icon) > =C2=A0=C2=A0 FAILED=C2=A0 96/97=C2=A0 expect-x-handle-no-bitmap-icon-nati= ve (0.000111 > sec) at ../../../gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp- > integrity.el:1 > =C2=A0=C2=A0 passed=C2=A0 97/97=C2=A0 expect-x-setup-function-keys-native= (0.004165 sec) >=20 > Ran 97 tests, 95 results as expected, 2 unexpected (2024-03-02 > 05:46:28+0000, 0.361428 sec) >=20 > 2 unexpected results: > =C2=A0=C2=A0 FAILED=C2=A0 expect-x-dnd-init-frame-native > =C2=A0=C2=A0 FAILED=C2=A0 expect-x-handle-no-bitmap-icon-native >=20 > error: in phase 'validate-comp-integrity': uncaught exception: > %exception #<&invoke-error program: > "/gnu/store/m01icx06dw1vs1krcj4jbmw71nv430dp-emacs-pgtk- > 29.2/bin/emacs" arguments: ("--batch" "--load" > "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-integrity.el" "-f" > "ert-run-tests-batch-and-exit") exit-status: 1 term-signal: #f stop- > signal: #f>=20 > phase `validate-comp-integrity' failed after 0.5 seconds > command "/gnu/store/m01icx06dw1vs1krcj4jbmw71nv430dp-emacs-pgtk- > 29.2/bin/emacs" "--batch" "--load" > "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-integrity.el" "-f" > "ert-run-tests-batch-and-exit" failed with status 1 > --8<---------------cut here---------------end--------------->8--- >=20 > Thank you very much for working on it! Try the attached patch and let me know if there's other failing Emacsen. Cheers --=-Ldn0F9+yx8pWgleDiQ7g Content-Disposition: attachment; filename="0001-aux-files-comp-integrity-Adjust-for-emacs-pgtk.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-aux-files-comp-integrity-Adjust-for-emacs-pgtk.patch"; charset="UTF-8" RnJvbSAxOWZjMjUyYWI3ZTg2YWQxNDQzYThkMTZmNjg0NjdjNjFiZjIzMTc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlEOiA8MTlmYzI1MmFiN2U4NmFkMTQ0M2E4ZDE2ZjY4NDY3 YzYxYmYyMzE3OS4xNzA5NTgyMzMwLmdpdC5saWxpYW5hLnByaWtsZXJAZ21haWwuY29tPgpGcm9t OiBMaWxpYW5hIE1hcmllIFByaWtsZXIgPGxpbGlhbmEucHJpa2xlckBnbWFpbC5jb20+CkRhdGU6 IE1vbiwgNCBNYXIgMjAyNCAyMDo1NDo0OSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIGF1eC1maWxl czogY29tcC1pbnRlZ3JpdHk6IEFkanVzdCBmb3IgZW1hY3MtcGd0ay4KCiogZ251L3BhY2thZ2Vz L2F1eC1maWxlcy9lbWFjcy9jb21wLWludGVncml0eS5lbCAoeC1kbmQtaW5pdC1mcmFtZSk6IFJl cXVpcmUKeC1kbmQuCih4LWhhbmRsZS1uby1iaXRtYXAtaWNvbik6IE9ubHkgdGVzdCB0aGlzIGlm IGl0J3MgYm91bmQuCi0tLQogZ251L3BhY2thZ2VzL2F1eC1maWxlcy9lbWFjcy9jb21wLWludGVn cml0eS5lbCB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2F1eC1maWxlcy9lbWFjcy9jb21w LWludGVncml0eS5lbCBiL2dudS9wYWNrYWdlcy9hdXgtZmlsZXMvZW1hY3MvY29tcC1pbnRlZ3Jp dHkuZWwKaW5kZXggOTY5MmQ5YmY5Ny4uMTkxZTJkZGI5OCAxMDA2NDQKLS0tIGEvZ251L3BhY2th Z2VzL2F1eC1maWxlcy9lbWFjcy9jb21wLWludGVncml0eS5lbAorKysgYi9nbnUvcGFja2FnZXMv YXV4LWZpbGVzL2VtYWNzL2NvbXAtaW50ZWdyaXR5LmVsCkBAIC0xMjUsNSArMTI1LDYgQEAKIChl eHBlY3QtbmF0aXZlIGVtYWNzLXZlcnNpb24pCiAoZXhwZWN0LW5hdGl2ZSBkZWZpbmUtd2lkZ2V0 KQogKGV4cGVjdC1uYXRpdmUgd2luZG93LXJpZ2h0KQotKGV4cGVjdC1uYXRpdmUgeC1kbmQtaW5p dC1mcmFtZSkKLShleHBlY3QtbmF0aXZlIHgtaGFuZGxlLW5vLWJpdG1hcC1pY29uKQorKGV4cGVj dC1uYXRpdmUgeC1kbmQtaW5pdC1mcmFtZSB4LWRuZCkKKyhhbmQgKGJvdW5kcCAneC1oYW5kbGUt bm8tYml0bWFwLWljb24pCisgICAgIChleHBlY3QtbmF0aXZlIHgtaGFuZGxlLW5vLWJpdG1hcC1p Y29uKSkKCmJhc2UtY29tbWl0OiAzZDRmYzkxMGY3MzIyMGY0N2U1ZjI0NTk4NTMzMzNhN2M4M2M1 ZDFkCnByZXJlcXVpc2l0ZS1wYXRjaC1pZDogOTZhZTI0YTM0MTlmY2NlYTE0MmQyNzI2YjExZmYy MGU3OThiZmJkMApwcmVyZXF1aXNpdGUtcGF0Y2gtaWQ6IGU5MDg4NTMyMjRiZmZmZmEyODUwODhk YzZlMzFhYmFmMTJjMTJlMDIKLS0gCjIuNDEuMAoK --=-Ldn0F9+yx8pWgleDiQ7g-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 07 03:56:25 2024 Received: (at 67260-done) by debbugs.gnu.org; 7 Mar 2024 08:56:25 +0000 Received: from localhost ([127.0.0.1]:52496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ri9Y8-0000r5-Gn for submit@debbugs.gnu.org; Thu, 07 Mar 2024 03:56:25 -0500 Received: from out-178.mta1.migadu.com ([95.215.58.178]:59104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ri9Y5-0000qo-GS for 67260-done@debbugs.gnu.org; Thu, 07 Mar 2024 03:56:22 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1709801713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4JFcEq2FTa/l23FXND//oBtvpyRM7MsWTThMurXUD80=; b=PlOjJRlnyguskj2ivgR/i9Wgztnwd8CxaigF2QcETFWdi/0boE1/mV0A40YXV6tx6RRm+9 eIpD8UCj2MyygB/xs936hDZMEpsCqXtwdNWqGdkgdDDEOkxuyKPlOP9pzugSanAUhbAfxB xY3M1DEdjb/JJ/Smftq+gBzywOpPYWrRklAw9IYY1LKlYTna9/vkdof6gNAp0n+CQMmwig ErKl+2azXvBmC0iQJbrKvoUTjf+Uqe1enOQqWUQ1alM+nLGf+/rHlvbhyLUmofvLhbJcsd qCpO7IqcQQxclJsPATQZnW7oMnwZLoYJ+wHqdnxOBftexOcnk5UrBLqwf+oZlw== From: Andrew Tropin To: Liliana Marie Prikler , Suhail Subject: Re: bug#67260: [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! In-Reply-To: References: <878r31onwr.fsf@bayesians.ca> Date: Thu, 07 Mar 2024 11:55:02 +0300 Message-ID: <878r2u8lqx.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260-done Cc: cox.katherine.e+guix@gmail.com, 67260-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2024-03-01 20:40, Liliana Marie Prikler wrote: > Am Freitag, dem 01.03.2024 um 17:35 +0000 schrieb Suhail: >> Is my expectation that reordering entries in the load-path shouldn't >> affect the natively-compiled status misplaced? > Yes. We take the first prefix match and compute the file names from > there. This is consistent with emacs matching the first file it finds > on the load-path. You can't do much better, because your load path may > only be partially specified at compile time and later expanded with > normal-top-level-add-to-load-path. > >> Where in v10 it failed because 3 features previously reported as >> being byte-compiled became natively-compiled, now it fails because >> the same 3 features go from being natively-compiled to byte-compiled >> after reordering load-path. > The expectation that load-path order does not matter is imho quite > unfounded. Note that we do ship the actually important test cases with > v11. > >> A separate bug issue can be created to track the peculiar dependence >> of the native-compilation status on the ordering of entries in load- >> path. > Well, to me it's not peculiar as I wrote the code, but I'm not sure how > familiar you are with Emacs' internals. If you feel up for it, go for > it, but I'd rather tackle other problems related to our emacs > ecosystem. > > Anyway, as you said, I'm pushing this now so that we can do a double > merge dance (i.e. master =E2=86=92 emacs-team, then request the other way) > starting early tomorrow. Hi Liliana!=20 guix time-machine --branch=3Demacs-team -- shell emacs-pgtk emacs-magit --p= ure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q fails with: =2D-8<---------------cut here---------------start------------->8--- passed 94/97 expect-window-right-native (0.002334 sec) Test expect-x-dnd-init-frame-native backtrace: signal(void-function (x-dnd-init-frame)) apply(signal (void-function (x-dnd-init-frame))) (setq value-477 (apply fn-475 args-476)) (unwind-protect (setq value-477 (apply fn-475 args-476)) (setq form- (if (unwind-protect (setq value-477 (apply fn-475 args-476)) (setq f (let (form-description-479) (if (unwind-protect (setq value-477 (app (let ((value-477 'ert-form-evaluation-aborted-478)) (let (form-descr (let* ((fn-475 #'eq) (args-476 (condition-case err (let ((signal-hoo (lambda nil (let* ((fn-475 #'eq) (args-476 (condition-case err (let=20 ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test ert-run-test(#s(ert-test :name expect-x-dnd-init-frame-native :docum ert-run-or-rerun-test(#s(ert--stats :selector t :tests ... :test-map ert-run-tests(t #f(compiled-function (event-type &rest event-args) # ert-run-tests-batch(nil) ert-run-tests-batch-and-exit() command-line-1(("--load" "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3 command-line() normal-top-level() Test expect-x-dnd-init-frame-native condition: (void-function x-dnd-init-frame) FAILED 95/97 expect-x-dnd-init-frame-native (0.000067 sec) at ../../..= /gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-integrity.el:1 Test expect-x-handle-no-bitmap-icon-native backtrace: signal(void-function (x-handle-no-bitmap-icon)) apply(signal (void-function (x-handle-no-bitmap-icon))) (setq value-482 (apply fn-480 args-481)) (unwind-protect (setq value-482 (apply fn-480 args-481)) (setq form- (if (unwind-protect (setq value-482 (apply fn-480 args-481)) (setq f (let (form-description-484) (if (unwind-protect (setq value-482 (app (let ((value-482 'ert-form-evaluation-aborted-483)) (let (form-descr (let* ((fn-480 #'eq) (args-481 (condition-case err (let ((signal-hoo (lambda nil (let* ((fn-480 #'eq) (args-481 (condition-case err (let=20 ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test ert-run-test(#s(ert-test :name expect-x-handle-no-bitmap-icon-native ert-run-or-rerun-test(#s(ert--stats :selector t :tests ... :test-map ert-run-tests(t #f(compiled-function (event-type &rest event-args) # ert-run-tests-batch(nil) ert-run-tests-batch-and-exit() command-line-1(("--load" "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3 command-line() normal-top-level() Test expect-x-handle-no-bitmap-icon-native condition: (void-function x-handle-no-bitmap-icon) FAILED 96/97 expect-x-handle-no-bitmap-icon-native (0.000103 sec) at .= ./../../gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-integrity.el:1 passed 97/97 expect-x-setup-function-keys-native (0.002261 sec) Ran 97 tests, 95 results as expected, 2 unexpected (2024-03-07 08:50:40+000= 0, 0.327688 sec) 2 unexpected results: FAILED expect-x-dnd-init-frame-native FAILED expect-x-handle-no-bitmap-icon-native error: in phase 'validate-comp-integrity': uncaught exception: %exception #<&invoke-error program: "/gnu/store/lkqd9kx4nb4y6dw58bn8gqhid6q= 51i30-emacs-pgtk-29.2/bin/emacs" arguments: ("--batch" "--load" "/gnu/store= /ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-integrity.el" "-f" "ert-run-tests-ba= tch-and-exit") exit-status: 1 term-signal: #f stop-signal: #f>=20 phase `validate-comp-integrity' failed after 0.5 seconds command "/gnu/store/lkqd9kx4nb4y6dw58bn8gqhid6q51i30-emacs-pgtk-29.2/bin/em= acs" "--batch" "--load" "/gnu/store/ql9y5r4ydz4dl8jjf2b2bz9fqhxmbm3x-comp-i= ntegrity.el" "-f" "ert-run-tests-batch-and-exit" failed with status 1 =2D-8<---------------cut here---------------end--------------->8--- =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmXpgOYACgkQIgjSCVjB 3rAAzxAAjCgCrVSW/gj2ZUV0OgjEiTwIw6FaaDTjf8TSbDJIEnamDpcW3N6EWuOO VlcRlRx4p37VnTl0lamRRs6EHffKv9CaOyCz8FFlxhT56gVgVERA34ERMF79luvB S5sQCBdnsooM2CyBpxfwYLAuQ/wdbnwVMYenXQD8RHHBWQOvZSI6Pd5Y1WiONJSz K3tUYdzDqo9ijZD2+VwDTeMfcwPEl8ZMbkU8l6XSxB0iLIP6HVGowioIglUV0JOt rC4kawWQ6ycoylHal0C0VWVr4tEGhHFz9VlWTHPqy6hftPcjYU2w0CvUMQmvmFbZ YoJQpDeVrDE4oitxbl5R3N31BDCSbdiHQMECI/1yJfaymy8UD+sRgZe//QwVyRUI u0Wr49jZGX+dUAyKGWdNwVUmKGTqWjSTv67hZHtMyiQdPSFo8DVW7AA590x1V47u aXy5spdkxtaqWql2BGRFzpIKX8a8ypA3AiXIWkCv17STWVNiMhrO4LH7w7BGH5vo x11rNov587hxY674ZOgpOP472AqP4kqlMMYlbE5L3h36QT6G5xLFaEGzOb6MXRi9 CTmrr6MH2mMrXKC3B6toJtxsoA7x8AjgSdnbl2vAtJ8SDRwGYTTycx/QBoCMsjWJ 2PJqMvgNT8tYgw2hEeOqRfExRHTVxM4jiCgczujvfiE4t7rGKwU= =SXwl -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 07 12:53:52 2024 Received: (at 67260-done) by debbugs.gnu.org; 7 Mar 2024 17:53:52 +0000 Received: from localhost ([127.0.0.1]:54844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riHwF-0005z1-RR for submit@debbugs.gnu.org; Thu, 07 Mar 2024 12:53:52 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:43200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riHwD-0005yd-Q6 for 67260-done@debbugs.gnu.org; Thu, 07 Mar 2024 12:53:50 -0500 Received: by mail-pj1-f65.google.com with SMTP id 98e67ed59e1d1-2995fa850ddso1751801a91.0 for <67260-done@debbugs.gnu.org>; Thu, 07 Mar 2024 09:53:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709833932; x=1710438732; darn=debbugs.gnu.org; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:from:to:cc:subject:date:message-id:reply-to; bh=EXnpG8NL6yJH1RueFrTsFHcAnBGwnVAdz3bj1slNmac=; b=WjxjZDxV5w5eiFwzl8xwbxu4yxpYBKUKZiJ8vLUC/DsIvGqp+qpiieD3hggXoEpAP/ 58w4T0I5+YslLIzhmtZTWti3hQ8yWDL41ZzovVkUzVS0FZO7BTK685VUiic1C7T4+kGg NYE49rQtGExNXC5LpXEmW04ZF2IWazJuUi8kcCIiPioX0x4vKjX9OS/Pf/RZaCq9LH9Z lkZDodNAI3P09RRVIsHdTqxDqOB7iOtEO3vKMbcy7qKleKLCNSKBTX7J37Pc4Pyxlklr tLhf3J2k1IeU4TpwHI3vtIJ2YRPPGYGrIsQTP1kRCn1XbBVQIoH3GXcfo4VEFcGRKGrX ajEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709833932; x=1710438732; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EXnpG8NL6yJH1RueFrTsFHcAnBGwnVAdz3bj1slNmac=; b=pv1ZqeVp6RHhTmAisSHVhaORNsHvH4z0qYqgOqRriIszR/4JfMJkNMerLc+M8iEQ1+ JkGSEvkCWiOF1JIfaMG3xF5Z52b8qFsVxc/+gM3nxQaLKwv+3Cu9Szxuq1fXMMdtJ/MW +ICSp2CvnNMH+o0wUCZfhChOTJhXZapnZMX40pboX2g/KRnh1CMawugLlGdyGg2Wxf0l QKgHsJRIUv6/ctc47edlZtgoAOJNo7vALIF+uCE7PCUwPQIC+b8JQ1R8IY/i+KAtBmVF RiAj3Udw5JZDupk6lNt2IHrGEHQabgwKBY6c/OHYe0FYYXbAPHswLjYV5hQwUnlxdFtR OARA== X-Forwarded-Encrypted: i=1; AJvYcCXg9kK8jaVMXlz+kfOwOs0veF9AzduiaB7DlSTzpX+go1LlbfbWFLgkZ5Y47V395dJtpHsERfgjyGO92IuLcy3tNeXB+ztsQ17YYw== X-Gm-Message-State: AOJu0YzHKy+XtgvyLcJ3P+Lj8Kk7xNXPjUrZ20uaCIWthjsTbAFT9RwW UZaDT42HaUFNQ9WhRJJBANRtrSAu+/OJcALDIwfOMYWsUX58SDGY X-Google-Smtp-Source: AGHT+IFHubDO2MMZAh070SVzpmsxWZGYx8ckPe5n8MqQHWVkqkyliek+VurF4uWkKiKNJJ8Mvx+qwg== X-Received: by 2002:a17:90a:8c08:b0:29b:6597:525b with SMTP id a8-20020a17090a8c0800b0029b6597525bmr3107818pjo.12.1709833932149; Thu, 07 Mar 2024 09:52:12 -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 s23-20020a17090aad9700b0029b6e3f089bsm1807632pjq.49.2024.03.07.09.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 09:52:11 -0800 (PST) Message-ID: <0de99db81d5337d754a30b982fc06e0e9c7b7d2f.camel@gmail.com> Subject: Re: bug#67260: [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! From: Liliana Marie Prikler To: Andrew Tropin , Suhail Date: Thu, 07 Mar 2024 18:52:07 +0100 In-Reply-To: <878r2u8lqx.fsf@trop.in> References: <878r31onwr.fsf@bayesians.ca> <878r2u8lqx.fsf@trop.in> Content-Type: multipart/mixed; boundary="=-/b8UUfb9dzWebS+6nUkZ" User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260-done Cc: cox.katherine.e+guix@gmail.com, 67260-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-/b8UUfb9dzWebS+6nUkZ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Am Donnerstag, dem 07.03.2024 um 11:55 +0300 schrieb Andrew Tropin: > Hi Liliana!=20 >=20 > guix time-machine --branch=3Demacs-team -- shell emacs-pgtk emacs-magit > --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q >=20 > fails with: >=20 > --8<---------------cut here---------------start------------->8--- > [...] > --8<---------------cut here---------------end--------------->8--- I already sent you a patch for that. Attaching it again. --=-/b8UUfb9dzWebS+6nUkZ Content-Disposition: attachment; filename="0001-aux-files-comp-integrity-Adjust-for-emacs-pgtk.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-aux-files-comp-integrity-Adjust-for-emacs-pgtk.patch"; charset="UTF-8" RnJvbSAxOWZjMjUyYWI3ZTg2YWQxNDQzYThkMTZmNjg0NjdjNjFiZjIzMTc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlEOiA8MTlmYzI1MmFiN2U4NmFkMTQ0M2E4ZDE2ZjY4NDY3 YzYxYmYyMzE3OS4xNzA5NTgyMzMwLmdpdC5saWxpYW5hLnByaWtsZXJAZ21haWwuY29tPgpGcm9t OiBMaWxpYW5hIE1hcmllIFByaWtsZXIgPGxpbGlhbmEucHJpa2xlckBnbWFpbC5jb20+CkRhdGU6 IE1vbiwgNCBNYXIgMjAyNCAyMDo1NDo0OSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIGF1eC1maWxl czogY29tcC1pbnRlZ3JpdHk6IEFkanVzdCBmb3IgZW1hY3MtcGd0ay4KCiogZ251L3BhY2thZ2Vz L2F1eC1maWxlcy9lbWFjcy9jb21wLWludGVncml0eS5lbCAoeC1kbmQtaW5pdC1mcmFtZSk6IFJl cXVpcmUKeC1kbmQuCih4LWhhbmRsZS1uby1iaXRtYXAtaWNvbik6IE9ubHkgdGVzdCB0aGlzIGlm IGl0J3MgYm91bmQuCi0tLQogZ251L3BhY2thZ2VzL2F1eC1maWxlcy9lbWFjcy9jb21wLWludGVn cml0eS5lbCB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2F1eC1maWxlcy9lbWFjcy9jb21w LWludGVncml0eS5lbCBiL2dudS9wYWNrYWdlcy9hdXgtZmlsZXMvZW1hY3MvY29tcC1pbnRlZ3Jp dHkuZWwKaW5kZXggOTY5MmQ5YmY5Ny4uMTkxZTJkZGI5OCAxMDA2NDQKLS0tIGEvZ251L3BhY2th Z2VzL2F1eC1maWxlcy9lbWFjcy9jb21wLWludGVncml0eS5lbAorKysgYi9nbnUvcGFja2FnZXMv YXV4LWZpbGVzL2VtYWNzL2NvbXAtaW50ZWdyaXR5LmVsCkBAIC0xMjUsNSArMTI1LDYgQEAKIChl eHBlY3QtbmF0aXZlIGVtYWNzLXZlcnNpb24pCiAoZXhwZWN0LW5hdGl2ZSBkZWZpbmUtd2lkZ2V0 KQogKGV4cGVjdC1uYXRpdmUgd2luZG93LXJpZ2h0KQotKGV4cGVjdC1uYXRpdmUgeC1kbmQtaW5p dC1mcmFtZSkKLShleHBlY3QtbmF0aXZlIHgtaGFuZGxlLW5vLWJpdG1hcC1pY29uKQorKGV4cGVj dC1uYXRpdmUgeC1kbmQtaW5pdC1mcmFtZSB4LWRuZCkKKyhhbmQgKGJvdW5kcCAneC1oYW5kbGUt bm8tYml0bWFwLWljb24pCisgICAgIChleHBlY3QtbmF0aXZlIHgtaGFuZGxlLW5vLWJpdG1hcC1p Y29uKSkKCmJhc2UtY29tbWl0OiAzZDRmYzkxMGY3MzIyMGY0N2U1ZjI0NTk4NTMzMzNhN2M4M2M1 ZDFkCnByZXJlcXVpc2l0ZS1wYXRjaC1pZDogOTZhZTI0YTM0MTlmY2NlYTE0MmQyNzI2YjExZmYy MGU3OThiZmJkMApwcmVyZXF1aXNpdGUtcGF0Y2gtaWQ6IGU5MDg4NTMyMjRiZmZmZmEyODUwODhk YzZlMzFhYmFmMTJjMTJlMDIKLS0gCjIuNDEuMAoK --=-/b8UUfb9dzWebS+6nUkZ-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 04:21:09 2024 Received: (at 67260-done) by debbugs.gnu.org; 8 Mar 2024 09:21:09 +0000 Received: from localhost ([127.0.0.1]:56611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riWPd-0007YD-6w for submit@debbugs.gnu.org; Fri, 08 Mar 2024 04:21:09 -0500 Received: from out-171.mta1.migadu.com ([95.215.58.171]:38340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riWPb-0007Wd-7u for 67260-done@debbugs.gnu.org; Fri, 08 Mar 2024 04:21:08 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1709889628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=poqHUcy+GSysaegJEMSoHevjesEy7kISfdzxEhVmxXo=; b=hVzdFRKi5bN0acSRnDnfMqvj2UGn4s9b2xZeLfqE6E5ZCr8axmXrTGQ50tk7R5bEzE6z5u bCxN+EeEjixJxFrkt7st+mDF3/ULC14UMah8IzoVnjUzB61l6g05W/XijVsq27Bc2iKoAr PoamJkQV/Vm5W9vE5zitjSlsi3GHpN6WTbcyrO9EtHGhzd3IHOuOtT+xb2yV3FwvqZZ+nv k/og7PwoyDobUR8SQBTPo5yaEvf9fbfCtHhfv81t0j4/uwYpFVhUFqo9PQ/cnIBMIUH8ZQ X3CyjnRr0yevEK9fYD0tlOAWUU5gKT+5dsaRpTkxt5QVqwot2OtWWPdSC10WcQ== From: Andrew Tropin To: Liliana Marie Prikler , Suhail Subject: Re: bug#67260: [PATCH emacs-team v11 0/7] You thought it was term/internal.el, but it was me, Dio! In-Reply-To: <0de99db81d5337d754a30b982fc06e0e9c7b7d2f.camel@gmail.com> References: <878r31onwr.fsf@bayesians.ca> <878r2u8lqx.fsf@trop.in> <0de99db81d5337d754a30b982fc06e0e9c7b7d2f.camel@gmail.com> Date: Fri, 08 Mar 2024 12:20:22 +0300 Message-ID: <87ttlhqdux.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67260-done Cc: cox.katherine.e+guix@gmail.com, 67260-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-03-07 18:52, Liliana Marie Prikler wrote: > Am Donnerstag, dem 07.03.2024 um 11:55 +0300 schrieb Andrew Tropin: >> Hi Liliana!=20 >>=20 >> guix time-machine --branch=3Demacs-team -- shell emacs-pgtk emacs-magit >> --pure -E '.*GTK.*|.*XDG.*|.*DISPLAY.*' -- emacs -Q >>=20 >> fails with: >>=20 >> --8<---------------cut here---------------start------------->8--- >> [...] >> --8<---------------cut here---------------end--------------->8--- > I already sent you a patch for that. Attaching it again. > > > From 19fc252ab7e86ad1443a8d16f68467c61bf23179 Mon Sep 17 00:00:00 2001 > Message-ID: <19fc252ab7e86ad1443a8d16f68467c61bf23179.1709582330.git.lili= ana.prikler@gmail.com> > From: Liliana Marie Prikler > Date: Mon, 4 Mar 2024 20:54:49 +0100 > Subject: [PATCH] aux-files: comp-integrity: Adjust for emacs-pgtk. > > * gnu/packages/aux-files/emacs/comp-integrity.el (x-dnd-init-frame): Requ= ire > x-dnd. > (x-handle-no-bitmap-icon): Only test this if it's bound. > --- > gnu/packages/aux-files/emacs/comp-integrity.el | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/package= s/aux-files/emacs/comp-integrity.el > index 9692d9bf97..191e2ddb98 100644 > --- a/gnu/packages/aux-files/emacs/comp-integrity.el > +++ b/gnu/packages/aux-files/emacs/comp-integrity.el > @@ -125,5 +125,6 @@ > (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) > +(expect-native x-dnd-init-frame x-dnd) > +(and (boundp 'x-handle-no-bitmap-icon) > + (expect-native x-handle-no-bitmap-icon)) > > base-commit: 3d4fc910f73220f47e5f2459853333a7c83c5d1d > prerequisite-patch-id: 96ae24a3419fccea142d2726b11ff20e798bfbd0 > prerequisite-patch-id: e908853224bffffa285088dc6e31abaf12c12e02 Yep, with this patch it seems to build correctly. =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmXq2FYACgkQIgjSCVjB 3rCWsw//b8tvGAu7/b4IYhIIdpaNMDMs44enSxjMBRmyJ+hKPJsYWAJgoOn4d7jj pasZk9LS3Rl11aeIXuU4b1bickG+V1R9iTgwfmjIpGhBvip3Gd5Coot3agO9u4Cs UeGztYVSpFKYC42qXPAQ/zrK/34V9/HeXRfBkTVa1soo55+kHye7aE9r1iv9X3IO IR2jwruTTOyjSNJQmjWaT21kF4e4mYOQHrTvBSEJ55lYq4QR+jce0GfQvqCck9Ce AVBLDvbWcU+sJXbL2ys9TVYxWD6cmCcMYR6fJi4SSMMVebavzN5arx2OQDp6P6Xv ASP+1Z4JCltR7b9a3gj4kZ/N5oN2z34kr2MP3AkaM/B7ymkJp/iCDYYfUdIihhi4 z3ANtm5vIrowABPpBq09abAtpOFBCx/sWizTWfkADQTMo9r+zMPR1DBziLBu6YsE is0EVhT/dKNxuJ02DyEB9+hl/lPcQkrKEc5jzmlRbYyawgqIRu9ZOSTtHGveVG+Z R7SnKNKjhGMOGIq8MS9c51Fv7eKpZ5K7/m93SvLDb3BGM4/98yZgzsSyXHlFbWw5 aVc/XwNszCrhOBZdsbEx6jeASkuPh6TNqr1m+P9twrk4vQ6bHdcbmPNRoslQFjAK bn1Z9PWNp+9ZGUJYt11DMIfs1jp06aq6u6dHUU5XG0O+//bqOis= =4sUe -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 11:39:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 05 Apr 2024 11:24:28 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator