Merge branch 'snapshot' into pgtk

native-comp.patch

@@ -8,7 +8,7 @@ index e97832455b9..b04cfa00c33 100644
    (cond ((eq system-type 'darwin) '("-Wl,-w"))
 -        ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
 +        ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))
-+        ((getenv "SNAP_USER_COMMON") (list (concat "--sysroot=" (file-name-as-directory (getenv "SNAP_USER_COMMON")) "sysroot/") (concat "-B" (file-name-as-directory (getenv "SNAP_USER_COMMON")) "sysroot/usr/lib/gcc/"))))
++        ((getenv "EMACS_SNAP_USER_COMMON") (list (concat "--sysroot=" (file-name-as-directory (getenv "EMACS_SNAP_USER_COMMON")) "sysroot/") (concat "-B" (file-name-as-directory (getenv "EMACS_SNAP_USER_COMMON")) "sysroot/usr/lib/gcc/"))))
    "Options passed verbatim to the native compiler's back-end driver.
  Note that not all options are meaningful; typically only the options
  affecting the assembler and linker are likely to be useful.

site-lisp/site-start.el

@@ -27,11 +27,13 @@
 ;; use it - use /snap/emacs/current if $SNAP is not set for some reason
 (setenv "EMACS_SNAP_DIR" (or (getenv "SNAP") "/snap/emacs/current"))
 
+(setenv "EMACS_SNAP_USER_COMMON" (or (getenv "SNAP_USER_COMMON") (expand-file-name "~/snap/emacs/common")))
+
 ;; ensure the correct native-comp-driver-options are set -- we also patch
 ;; comp.el in when building the emacs snap but do it here too to try and
 ;; ensure this is always set no matter what
 (when (require 'comp nil t)
-  (let ((sysroot (concat (file-name-as-directory (getenv "SNAP_USER_COMMON"))
+  (let ((sysroot (concat (file-name-as-directory (getenv "EMACS_SNAP_USER_COMMON"))
                          "sysroot/")))
     (dolist (opt (list (concat "--sysroot=" sysroot)
                        (concat "-B" sysroot "usr/lib/gcc/")))

snapcraft.yaml

@@ -53,6 +53,8 @@ parts:
   emacs:
     after: [tree-sitter]
     plugin: nil
+    build-attributes:
+      - enable-patchelf
     source: git://git.savannah.gnu.org/emacs.git
     source-depth: 1
     organize:
@@ -353,8 +355,9 @@ parts:
       grep -q SNAP "usr/share/emacs/${VERSION}/lisp/emacs-lisp/comp.el" || sed "s/@@VERSION@@/${VERSION}/g" $SNAPCRAFT_PROJECT_DIR/native-comp.patch | sed "s/@@MULTIARCH@@/$CRAFT_ARCH_TRIPLET_BUILD_FOR/g" | patch -p1
       ../parts/emacs/build/src/emacs -batch -f batch-byte+native-compile "usr/share/emacs/${VERSION}/lisp/emacs-lisp/comp.el"
       # compiled eln files get put back in the build directory - copy them over
-      # manually
-      VERSION_HASH=$(basename ../parts/emacs/build/native-lisp/*)
+      # manually - there may be more than one directory here but only one will
+      # contain the comp related eln files
+      VERSION_HASH=$(basename $(dirname ../parts/emacs/build/native-lisp/*/comp-common*.eln))
       cp "../parts/emacs/build/native-lisp/${VERSION_HASH}"/comp-*.eln "usr/lib/emacs/${VERSION}/native-lisp/${VERSION_HASH}/"
       gzip usr/share/emacs/*/lisp/emacs-lisp/comp.el
 

treesit.patch

@@ -22,21 +22,21 @@ index a9761dbb38d..274b3979bd7 100644
            (treesit--call-process-signal
 -           cc nil t nil "-fPIC" "-c" "-I." "parser.c")
 +           cc nil t nil "-fPIC" "-c" "-I."
-+           "--sysroot" (file-name-as-directory (getenv "EMACS_SNAP_DIR"))
++           "--sysroot" (concat (file-name-as-directory (getenv "EMACS_SNAP_USER_COMMON")) "sysroot/")
 +           "parser.c")
            ;; cc -fPIC -c -I. scanner.c
            (when (file-exists-p "scanner.c")
              (treesit--call-process-signal
 -             cc nil t nil "-fPIC" "-c" "-I." "scanner.c"))
 +             cc nil t nil "-fPIC" "-c" "-I."
-+             "--sysroot" (file-name-as-directory (getenv "EMACS_SNAP_DIR"))
++             "--sysroot" (concat (file-name-as-directory (getenv "EMACS_SNAP_USER_COMMON")) "sysroot/")
 +             "scanner.c"))
            ;; c++ -fPIC -I. -c scanner.cc
            (when (file-exists-p "scanner.cc")
              (treesit--call-process-signal
 -             c++ nil t nil "-fPIC" "-c" "-I." "scanner.cc"))
 +             c++ nil t nil "-fPIC" "-c" "-I."
-+             "--sysroot" (file-name-as-directory (getenv "EMACS_SNAP_DIR"))
++             "--sysroot" (concat (file-name-as-directory (getenv "EMACS_SNAP_USER_COMMON")) "sysroot/")
 +             "scanner.cc"))
            ;; cc/c++ -fPIC -shared *.o -o "libtree-sitter-${lang}.${soext}"
            (apply #'treesit--call-process-signal
@@ -45,7 +45,7 @@ index a9761dbb38d..274b3979bd7 100644
                            (rx bos (+ anychar) ".o" eos))
                         "-o" ,lib-name)
                     `("-fPIC" "-shared"
-+                     "--sysroot" ,(file-name-as-directory (getenv "EMACS_SNAP_DIR"))
++                     "--sysroot" ,(concat (file-name-as-directory (getenv "EMACS_SNAP_USER_COMMON")) "sysroot/")
                       ,@(directory-files
                          default-directory nil
                          (rx bos (+ anychar) ".o" eos))