From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id OJmuB28QfGeDaQEAqHPOHw:P1 (envelope-from ) for ; Mon, 06 Jan 2025 17:18:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id OJmuB28QfGeDaQEAqHPOHw (envelope-from ) for ; Mon, 06 Jan 2025 18:18:39 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=sZD5PLeh; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WfqkVsa+; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1736183919; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+2qnc8ki+LOzVwOBk4n7nrDooFWLiVBX7dZ+hrkzsjs=; b=qepUmmEwaz/45x2io6UIDM7t66KR4CJdouUG5RzsVRVr8jM/4zzxWBjD65zpXAr2e+wPst 2MhOBjBuwmfqc+4ZHzSXAlPpyDNFHV2rfjJju2sBgxAv9GxX7FjrbItWWPeJ4EKsfYkhGC AhGKFiB1zK7wZgIsEjgxUlrNrKdCsepJn5Wn0APycC0B7DQJ1EpQNcUOX2/3588oVXNruJ zvMimaMqEUA9eoa9tdW0dA2U4ESsoC+bFFq1rAKiJx5ck8naMwT05UyB7noAU5FqGmd2Wl J4hBpgLChIF1COSeCg5m9Qyoft4/OjljnNbKe13hWPUiUofSNfNBHguWK/3GJg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=sZD5PLeh; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WfqkVsa+; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1736183919; a=rsa-sha256; cv=none; b=uQJD8eAjiqVgZeD3Jlp8ppfv+agkG8TrCp9jKmP5IE4y/NNsZ6tf4ZlsCY12QoW8RgbRWP Ynq4b17WIojCEKcfFR9H3rpLWiykenfiJImaSYDx856cZMRBKLHKqdhz5TaGopj55+CiVX 4958EVDQOhajqGo7XPAryUskqPqngNMHpYg15jkqCquL0wrKB+DrE+kNrXfWYsfGV2PDZ/ mAeG7N+5Cxo8lU8aeewfF96o2FWrNUWg1gIkhmI2yQ8pf2rzq9i2gHOg1r6B8TN7/eqxEq CJr31lKjdM4XpUITMvfiy5rYfCERnF6c9rtWxlw0LGNCJQ2oiCUpKNjcthIDpg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A4F819E2E2 for ; Mon, 06 Jan 2025 18:18:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tUqC1-0004Hm-VD; Mon, 06 Jan 2025 11:43:05 -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 1tUqBz-0004Gs-BK for guix-patches@gnu.org; Mon, 06 Jan 2025 11:43:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tUqBz-00077O-3E for guix-patches@gnu.org; Mon, 06 Jan 2025 11:43:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=+2qnc8ki+LOzVwOBk4n7nrDooFWLiVBX7dZ+hrkzsjs=; b=sZD5PLehlUy+K/J1x2JjRtti2t4zTja5EAspsYEwd2iPZgfK5ok6p6VH/a/rbzo3irhBSMGfNpLjKQG/tQijDIiPfNZ9Bx/jlgZBI5fExCkZXZXEYxJs2sjVdT19W7HWx5P0HCrMTrCho6GJWhNcBCTL8UEF/ixjSp9W98dp1ZMS06rhB+PZcgc9SzGIBcJHk+0PLvW8H01jpGZW68UYypHt48/RBvb2ASZPigYlI5hE+2xaaI+VPodrx6BMOglNTurHbGjQQhkS3pr0sSPB8Y8P78jLTdOx2N5+PXkXE/+fiTAzXl1wAmhd9pNupNnUK3ZOTX09hVg73q5yOWbfkA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tUqBy-0006Mk-Sh; Mon, 06 Jan 2025 11:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75268] [PATCH emacs-team v2 1/3] gnu: emacs-next: Don't hash file names in native compilation. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, ian@retrospec.tv, guix-patches@gnu.org Resent-Date: Mon, 06 Jan 2025 16:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75268 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75268@debbugs.gnu.org Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, ian@retrospec.tv X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, ian@retrospec.tv Received: via spool by 75268-submit@debbugs.gnu.org id=B75268.173618173324376 (code B ref 75268); Mon, 06 Jan 2025 16:43:02 +0000 Received: (at 75268) by debbugs.gnu.org; 6 Jan 2025 16:42:13 +0000 Received: from localhost ([127.0.0.1]:39813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUqB9-0006L0-OC for submit@debbugs.gnu.org; Mon, 06 Jan 2025 11:42:12 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:48253) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tUqB4-0006Jj-Nq for 75268@debbugs.gnu.org; Mon, 06 Jan 2025 11:42:08 -0500 Received: by mail-wr1-x441.google.com with SMTP id ffacd0b85a97d-3862b40a6e0so8026606f8f.0 for <75268@debbugs.gnu.org>; Mon, 06 Jan 2025 08:42:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736181717; x=1736786517; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=+2qnc8ki+LOzVwOBk4n7nrDooFWLiVBX7dZ+hrkzsjs=; b=WfqkVsa+GSve3lOUEnQbPfJl2gP+9dNvdVN/nMzrKvnm9sdEfc9NKqiPdeBFeXLRqp 4E9DZHwjF1k+2RaymUGiOrGabk93Xv97vuMwZOgzA+t6c8L9ITMuODCkVEOpshUSbfgQ oZiiGf0OR/HGGFOIhxiy4LufBHPvLI6dFWgdwl3SQMUGvcBFwdnzXS1opDRp6hsmf59k Z9i6gxS/SzBvi+BD2QlvdFg5d0gq93UudqDZPUgjSPiAxuP3PL1oa/BVLgsGXkI0JstH stOh7eQv2hzsYp604IOUtHtDzeErEW9/FbhAXV1S2Xd1JbFPEgg/dk3dlrt+L6/rDvlj 5b9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736181717; x=1736786517; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+2qnc8ki+LOzVwOBk4n7nrDooFWLiVBX7dZ+hrkzsjs=; b=F/eHTaR+p2mIfmZGgBnx2av/RJOo7pWKG+fM0cBxMxiTcPrti88OXkxyvsn1KBxMJT BZHFOU/rH168h5OCuJIUDrWjaB0UX8SaI78l1aEFt0eEhFTUs+9ej+JClUCaVO29V5r5 z+OHGpuS07TA3vt1wznOnsEEJbic+beq4usnKnqzZrjtBLUH30j5Vs20tAI1UJNh6fr4 zsDyoyjX6wta+OxGEvCtWbL/7GQcRQpdheiOqox2JoR8uR6GfKmn572RyFw0IYFVMLnc kVuFOTqGpy2KLEwjqXIFrpXot2hs5M2G2kFvuU4PXI1KJrHjhc86CSyITksNoSAQVGHS m1SQ== X-Gm-Message-State: AOJu0YyT0Z84XDFWzkHDwbqUKd7nPSl2Mi54X2Yn5ZKArVcRiXGvSc/U ntFf0Abbxieip/FFSp6ANzAHZ6L5r3UYSuOvrWliWYHBT9/xMOzr4Dgb666L X-Gm-Gg: ASbGncu6YlDf/206T7a8dfYeisoEsStnfvrG/+jvh9qSxOArLo7Iffmgtb8fr0tdxI6 Jf8AG5M3u0VLnFIKUiKP8V81gChT1+LM9jNtyYUeHPLpmD0WTmFN55QEJ5Gpo9hCSc0RlQJAhWR uPiGgumryrzO6dwUtLlGkb6yU5e/rBNUkTPuVXpBbGjzO+GxHtv9ushoB0JfY8o1S/Qgbuwf+xV PYyH1gURBC6rmeZPgB4uPM2sfeWNxE6Jgpu9c7XiRH7t0XZ59RGRdIaUr24NAo9Qek/wdxalJgH IrnAHLrpmugR67lFr5DbENt+/wOJ791D X-Google-Smtp-Source: AGHT+IG4huv+JQnyCDUf/yY4f1sQMXcmCV2tKX+b8+AgeNqoAPVQkZ6+zr6F0kOuxjdSzRvu+pz60w== X-Received: by 2002:a5d:47cf:0:b0:385:ee59:44eb with SMTP id ffacd0b85a97d-38a221fa9ffmr48141010f8f.33.1736181717018; Mon, 06 Jan 2025 08:41:57 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8288b8sm47863365f8f.11.2025.01.06.08.41.56 for <75268@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 08:41:56 -0800 (PST) Message-ID: <161b5fd3c108eedbb469e237570af3727bda42e5.1736181798.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Wed, 1 Jan 2025 22:15:31 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.06 X-Spam-Score: 3.06 X-Migadu-Queue-Id: A4F819E2E2 X-Migadu-Scanner: mx10.migadu.com X-TUID: 86ZKpHbjXdjj * gnu/packages/patches/emacs-next-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. --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + ...emacs-next-native-comp-fix-filenames.patch | 345 ++++++++++++++++++ 3 files changed, 347 insertions(+) create mode 100644 gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0adc7aa2d9..da756b33d5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1210,6 +1210,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-native-comp-pin-packages.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-next-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a24242d5d7..e1a9a9a51f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -577,6 +577,7 @@ (define-public emacs-next-minimal (search-patches "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-next-native-comp-driver-options.patch" + "emacs-next-native-comp-fix-filenames.patch" "emacs-pgtk-super-key-fix.patch"))))))) (define* (emacs->emacs-next emacs #:optional name diff --git a/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch new file mode 100644 index 0000000000..7897fa9b04 --- /dev/null +++ b/gnu/packages/patches/emacs-next-native-comp-fix-filenames.patch @@ -0,0 +1,345 @@ +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-next/src/comp.c +=================================================================== +--- emacs-next.orig/src/comp.c ++++ emacs-next/src/comp.c +@@ -4403,26 +4403,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); + +@@ -4430,64 +4421,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, +@@ -4501,13 +4483,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; +@@ -4555,10 +4531,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); + +@@ -5875,10 +5852,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-next/lisp/startup.el +=================================================================== +--- emacs-next.orig/lisp/startup.el ++++ emacs-next/lisp/startup.el +@@ -527,9 +527,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. +@@ -540,22 +537,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 startup--rescale-elt-match-p (font-pattern font-object) + "Test whether FONT-OBJECT matches an element of `face-font-rescale-alist'. + FONT-OBJECT is a font-object that specifies a font to test. +@@ -1383,12 +1368,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 +@@ -1523,12 +1502,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-next/lisp/loadup.el +=================================================================== +--- emacs-next.orig/lisp/loadup.el ++++ emacs-next/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. +@@ -538,27 +546,25 @@ This to have it working when installed o + directory got moved. This is set to be a pair in the form of: + \(rel-filename-from-install-bin . rel-filename-from-local-bin)." + (when (and load--bin-dest-dir load--eln-dest-dir) +- (setq eln-dest-dir +- (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/")) ++ (setq load--eln-versioned-dest-dir ++ (concat load--eln-dest-dir "native-lisp/" comp-native-version-dir "/")) + (maphash (lambda (_ cu) + (when (stringp (native-comp-unit-file 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) +- load--bin-dest-dir) ++ (file-relative-name ++ (expand-file-name ++ (save-match-data ++ (string-match native-lisp-needle file) ++ (substring file (match-end 0))) ++ load--eln-versioned-dest-dir) ++ load--bin-dest-dir) + ;; Relative filename from the built uninstalled binary. + (file-relative-name file invocation-directory)))))) + comp-loaded-comp-units-h))) +@@ -644,7 +650,9 @@ directory got moved. This is set to be + (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-next/src/Makefile.in +=================================================================== +--- emacs-next.orig/src/Makefile.in ++++ emacs-next/src/Makefile.in +@@ -591,6 +591,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. base-commit: f3af755d75677e9671e99fcb986c60474567ba54 -- 2.47.1