Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 11:15:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 25 06:15:01 2023
Received: from localhost ([127.0.0.1]:37991 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r6qcm-0006yo-Qb
for submit <at> 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 <liliana.prikler@HIDDEN>) id 1r6qcj-0006yJ-DN
for 67260 <at> 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 <at> 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: <daf346bcc21247579cb4a10d48c7c4407a7b7283.1700910860.git.liliana.prikler@HIDDEN>
In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@HIDDEN>
References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
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 <at> 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@HIDDEN, andrew@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> 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/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
guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.
Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 11:14:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 25 06:14:56 2023
Received: from localhost ([127.0.0.1]:37987 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r6qci-0006yW-Fv
for submit <at> 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 <liliana.prikler@HIDDEN>) id 1r6qcg-0006yC-Jc
for 67260 <at> 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 <at> 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@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
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 <at> 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@HIDDEN, andrew@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> 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
[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
guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.
Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 08:23:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 25 03:23:05 2023
Received: from localhost ([127.0.0.1]:37741 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r6nwP-0007l8-5j
for submit <at> 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 <liliana.prikler@HIDDEN>) id 1r6nwM-0007ka-Kz
for 67260 <at> 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 <at> 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@HIDDEN>
In-Reply-To: <190e882ba2705f244b04231112a9926e9dcebc29.1700900541.git.liliana.prikler@HIDDEN>
References: <190e882ba2705f244b04231112a9926e9dcebc29.1700900541.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
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 <at> 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 <mekeor@HIDDEN>, cox.katherine.e+guix@HIDDEN,
andrew@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> 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: 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
guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.
Received: (at 67260) by debbugs.gnu.org; 22 Nov 2023 17:39:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 22 12:39:33 2023
Received: from localhost ([127.0.0.1]:59852 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r5rCH-0001Jv-Ev
for submit <at> 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 <liliana.prikler@HIDDEN>) id 1r5rCD-0001Jf-AA
for 67260 <at> 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 <at> 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@HIDDEN>
Subject: Re: [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: Mekeor Melire <mekeor@HIDDEN>
Date: Wed, 22 Nov 2023 18:39:17 +0100
In-Reply-To: <87o7fmyohc.fsf@HIDDEN>
References: <cover.1700314926.git.liliana.prikler@HIDDEN>
<87o7fmyohc.fsf@HIDDEN>
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@HIDDEN, 67260 <at> debbugs.gnu.org, andrew@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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@HIDDEN:
>=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
guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.
Received: (at 67260) by debbugs.gnu.org; 22 Nov 2023 12:16:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 22 07:16:41 2023
Received: from localhost ([127.0.0.1]:58168 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r5m9o-0006C4-Hh
for submit <at> debbugs.gnu.org; Wed, 22 Nov 2023 07:16:40 -0500
Received: from mout02.posteo.de ([185.67.36.66]:35939)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mekeor@HIDDEN>) id 1r5m9m-0006Br-I0
for 67260 <at> debbugs.gnu.org; Wed, 22 Nov 2023 07:16:38 -0500
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id AA4C8240103
for <67260 <at> debbugs.gnu.org>; 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: <cover.1700314926.git.liliana.prikler@HIDDEN>
From: Mekeor Melire <mekeor@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>
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: <cover.1700314926.git.liliana.prikler@HIDDEN>
Message-ID: <87o7fmyohc.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; format=flowed
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 67260
Cc: cox.katherine.e+guix@HIDDEN, 67260 <at> debbugs.gnu.org, guix-patches@HIDDEN,
andrew@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
2023-11-18 14:42 liliana.prikler@HIDDEN:
> 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.
guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 22 Nov 2023 12:17:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 22 07:17:00 2023
Received: from localhost ([127.0.0.1]:58171 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r5mA8-0006G3-0P
for submit <at> 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 <mekeor@HIDDEN>) id 1r5mA6-0006DW-Gz
for submit <at> 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 <mekeor@HIDDEN>) id 1r5m9k-0008KO-Dp
for guix-patches@HIDDEN; 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 <mekeor@HIDDEN>) id 1r5m9i-0006td-60
for guix-patches@HIDDEN; 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 <guix-patches@HIDDEN>; 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: <cover.1700314926.git.liliana.prikler@HIDDEN>
From: Mekeor Melire <mekeor@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>
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: <cover.1700314926.git.liliana.prikler@HIDDEN>
Message-ID: <87o7fmyohc.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; format=flowed
Received-SPF: pass client-ip=185.67.36.66; envelope-from=mekeor@HIDDEN;
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@HIDDEN, 67260 <at> debbugs.gnu.org, guix-patches@HIDDEN,
andrew@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
2023-11-18 14:42 liliana.prikler@HIDDEN:
> 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.
guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.Received: (at 67260) by debbugs.gnu.org; 18 Nov 2023 15:51:20 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 18 10:51:20 2023 Received: from localhost ([127.0.0.1]:49327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r4NbM-0003yB-2K for submit <at> 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 <liliana.prikler@HIDDEN>) id 1r4NbJ-0003xv-Gu for 67260 <at> 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 <at> 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@HIDDEN> Subject: Re: [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Andrew Tropin <andrew@HIDDEN>, 67260 <at> debbugs.gnu.org Date: Sat, 18 Nov 2023 16:51:07 +0100 In-Reply-To: <87cyw72hiy.fsf@HIDDEN> References: <cover.1700314926.git.liliana.prikler@HIDDEN> <87cyw72hiy.fsf@HIDDEN> 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@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> 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 > > <https://bugs.gnu.org/66864> > >=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.
guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.Received: (at 67260) by debbugs.gnu.org; 18 Nov 2023 15:44:19 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 18 10:44:19 2023 Received: from localhost ([127.0.0.1]:49317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r4NUZ-0003hk-9e for submit <at> 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 <andrew@HIDDEN>) id 1r4NUW-0003hU-TN for 67260 <at> 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 <andrew@HIDDEN> To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 67260 <at> debbugs.gnu.org Subject: Re: [bug#67260] [PATCH emacs-team 0/2] Think ahead when compiling In-Reply-To: <cover.1700314926.git.liliana.prikler@HIDDEN> References: <cover.1700314926.git.liliana.prikler@HIDDEN> Date: Sat, 18 Nov 2023 19:44:05 +0400 Message-ID: <87cyw72hiy.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-GND-Sasl: andrew@HIDDEN X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67260 Cc: cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> 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 <https://bugs.gnu.= org/66864> > > 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----- --=-=-=--
guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.
Received: (at 67260) by debbugs.gnu.org; 18 Nov 2023 14:50:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 18 09:50:55 2023
Received: from localhost ([127.0.0.1]:47991 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r4Met-00020z-1I
for submit <at> 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 <liliana.prikler@HIDDEN>) id 1r4Mep-00020h-3I
for 67260 <at> 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 <at> 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 <at> 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: <f38d16e04962f76bc74503a105065c1a30d51ff7.1700314926.git.liliana.prikler@HIDDEN>
In-Reply-To: <cover.1700314926.git.liliana.prikler@HIDDEN>
References: <cover.1700314926.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
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@HIDDEN, cox.katherine.e+guix@HIDDEN,
liliana.prikler@HIDDEN
to: 67260 <at> 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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> 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/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
andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 18 Nov 2023 13:49:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 18 08:49:12 2023
Received: from localhost ([127.0.0.1]:47957 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1r4LhA-0000WY-Cw
for submit <at> 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 <liliana.prikler@HIDDEN>) id 1r4Lh5-0000W5-Ca
for submit <at> 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 <liliana.prikler@HIDDEN>)
id 1r4Lgy-0000wn-TF
for guix-patches@HIDDEN; 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 <liliana.prikler@HIDDEN>)
id 1r4Lgx-0005D9-6q
for guix-patches@HIDDEN; Sat, 18 Nov 2023 08:49:00 -0500
Received: by mail-wm1-x344.google.com with SMTP id
5b1f17b1804b1-40859c466efso3453105e9.3
for <guix-patches@HIDDEN>; 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 <guix-patches@HIDDEN>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 18 Nov 2023 05:48:56 -0800 (PST)
Message-ID: <cover.1700314926.git.liliana.prikler@HIDDEN>
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
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@HIDDEN, cox.katherine.e+guix@HIDDEN,
liliana.prikler@HIDDEN
to: guix-patches@HIDDEN
Received-SPF: pass client-ip=2a00:1450:4864:20::344;
envelope-from=liliana.prikler@HIDDEN; 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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> 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: 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 <https://bugs.gnu.org/66864>
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
Liliana Marie Prikler <liliana.prikler@HIDDEN>:andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN.
Full text available.andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:bug#67260; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.