* Fix MacOS Emacs.app installation (bug#43532)

	* src/comp.c (Fcomp_el_to_eln_filename): Adapt the filename
	hashing algorithm to allow for producing a MacOS self-contained
	Emacs.app.

1 files changed, 22 insertions, 9 deletions

diff --git a/src/comp.c b/src/comp.c
index 15d85d30fcb..f831b09ab1d 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4054,18 +4054,31 @@ If BASE-DIR is nil use the first entry in `comp-eln-load-path'.  */)
 
   if (NILP (loadsearch_re_list))
     {
-      Lisp_Object loadsearch_list =
-        Fcons (build_string (PATH_DUMPLOADSEARCH),
-               Fcons (build_string (PATH_LOADSEARCH), Qnil));
-      FOR_EACH_TAIL (loadsearch_list)
-        loadsearch_re_list =
-          Fcons (Fregexp_quote (XCAR (loadsearch_list)), loadsearch_re_list);
+      Lisp_Object sys_rx;
+#ifdef __APPLE__
+      /* On MacOS we relax the match on PATH_LOADSEARCH making
+         everything before ".app/" a wildcard.  This to obtain a
+         self-contained Emacs.app (bug#43532).  */
+      char *c;
+      if ((c = strstr (PATH_LOADSEARCH, ".app/")))
+        sys_rx =
+          concat2 (build_string ("\\`[[:ascii:]]+"),
+                   Fregexp_quote (build_string (c)));
+      else
+        sys_rx = Fregexp_quote (build_string (PATH_LOADSEARCH));
+#else
+      sys_rx = Fregexp_quote (build_string (PATH_LOADSEARCH));
+#endif
+      loadsearch_re_list =
+        list2 (Fregexp_quote (sys_rx),
+               Fregexp_quote (build_string (PATH_DUMPLOADSEARCH)));
     }
-  Lisp_Object loadsearch_res = loadsearch_re_list;
-  FOR_EACH_TAIL (loadsearch_res)
+
+  Lisp_Object lds_re_tail = loadsearch_re_list;
+  FOR_EACH_TAIL (lds_re_tail)
     {
       Lisp_Object match_idx =
-        Fstring_match (XCAR (loadsearch_res), filename, Qnil);
+        Fstring_match (XCAR (lds_re_tail), filename, Qnil);
       if (EQ (match_idx, make_fixnum (0)))
         {
           filename =