From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andrea Corallo via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#46256: [feature/native-comp] AOT eln files ignored if run from build tree Date: Fri, 26 Feb 2021 20:34:10 +0000 Message-ID: References: <865z3866my.fsf@gmail.com> <865z38a9vo.fsf@gmail.com> <86eehujcip.fsf@gmail.com> <86blch14qt.fsf@gmail.com> <83h7m84h9g.fsf@gnu.org> <86v9ao5czu.fsf@gmail.com> Reply-To: Andrea Corallo Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39036"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 46256@debbugs.gnu.org To: Andy Moreton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Feb 26 21:36:38 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lFjqm-00094U-Pe for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 26 Feb 2021 21:36:36 +0100 Original-Received: from localhost ([::1]:54480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFjqS-0002HR-Sv for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 26 Feb 2021 15:36:16 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFjpG-0000hl-8j for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2021 15:35:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59332) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFjpF-0006jZ-WF for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2021 15:35:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lFjpF-0005Ij-SB for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2021 15:35:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andrea Corallo Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Feb 2021 20:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46256 X-GNU-PR-Package: emacs Original-Received: via spool by 46256-submit@debbugs.gnu.org id=B46256.161437165920320 (code B ref 46256); Fri, 26 Feb 2021 20:35:01 +0000 Original-Received: (at 46256) by debbugs.gnu.org; 26 Feb 2021 20:34:19 +0000 Original-Received: from localhost ([127.0.0.1]:42645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lFjoV-0005Ha-3Y for submit@debbugs.gnu.org; Fri, 26 Feb 2021 15:34:18 -0500 Original-Received: from mx.sdf.org ([205.166.94.24]:64014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lFjoS-0005HR-Lc for 46256@debbugs.gnu.org; Fri, 26 Feb 2021 15:34:13 -0500 Original-Received: from mab (ma.sdf.org [205.166.94.33]) by mx.sdf.org (8.15.2/8.14.5) with ESMTPS id 11QKYAap007081 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO); Fri, 26 Feb 2021 20:34:11 GMT In-Reply-To: <86v9ao5czu.fsf@gmail.com> (Andy Moreton's message of "Fri, 19 Feb 2021 14:49:25 +0000") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:200890 Archived-At: --=-=-= Content-Type: text/plain Andy Moreton writes: [...] > The problem is with the file names used to generate the hashes, where > comparison of file names. > > As an experiment, I changed epaths.h from: > #define PATH_DUMPLOADSEARCH "C:/emacs/git/emacs/native/lisp" > > to: > #define PATH_DUMPLOADSEARCH "c:/emacs/git/emacs/native/lisp" > > and then ran make (to build without regenerating the header). > The resulting emacs did not complain about mismatched filenames. > > Thus the fix outlined by Eli above looks like it will solve the problem. > > AndyM Hi Andy, could you give it a try to the attached patch? It follows Eli's suggestion of using 'Fw32_long_file_name'. Thanks Andrea --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Canonicalize-filenames-on-Windows-before-hashing-bug.patch >From 312deba5302a8136fa104b054af54572cc64ea5e Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Fri, 26 Feb 2021 21:27:02 +0100 Subject: [PATCH] * Canonicalize filenames on Windows before hashing (bug#46256) * src/comp.c (Fcomp_el_to_eln_filename): On Windowns canonicalize filenames before hashing. --- src/comp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/comp.c b/src/comp.c index a8b8ef95fa..1a89e4e62a 100644 --- a/src/comp.c +++ b/src/comp.c @@ -3983,6 +3983,10 @@ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, if (NILP (Ffile_exists_p (filename))) xsignal1 (Qfile_missing, filename); +#ifdef WINDOWSNT + filename = Fw32_long_file_name (filename); +#endif + Lisp_Object content_hash = comp_hash_source_file (filename); if (suffix_p (filename, ".gz")) @@ -4014,8 +4018,11 @@ DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, Lisp_Object sys_re = concat2 (build_string ("\\`[[:ascii:]]+"), Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); - loadsearch_re_list = - list2 (sys_re, Fregexp_quote (build_string (PATH_DUMPLOADSEARCH "/"))); + Lisp_Object dump_load_search = build_string (PATH_DUMPLOADSEARCH "/"); +#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; -- 2.20.1 --=-=-=--