Merge branch 'snapshot' into core22

alexmurray · Aug 4, 2023 · 56ba930 · 56ba930
2 parents 5826977 + c2ae964
commit 56ba930
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -64,7 +64,7 @@ parts:
         "--without-xaw3d",
         "--with-modules",
         "--with-cairo",
-        "--with-native-compilation",
+        "--with-native-compilation=aot",
         "--with-xinput2",
         "--with-tree-sitter",
         "--with-json"
@@ -270,7 +270,10 @@ parts:
       # ensure we use the right path in the patch file
       VERSION=$(echo usr/share/emacs/*/lisp/emacs-lisp/comp.el | cut -d / -f 4)
       sed s/@@VERSION@@/$VERSION/g $SNAPCRAFT_PROJECT_DIR/native-comp.patch | patch -p1
-      ../parts/emacs/build/src/emacs -batch -f batch-byte-compile usr/share/emacs/*/lisp/emacs-lisp/comp.el
+      ../parts/emacs/build/src/emacs -batch -f batch-byte+native-compile usr/share/emacs/*/lisp/emacs-lisp/comp.el
+      # compiled eln files get put back in the build directory - copy them over
+      # manually
+      cp ../parts/emacs/build/native-lisp/*/comp-*.eln usr/lib/emacs/*/native-lisp/*/
       gzip usr/share/emacs/*/lisp/emacs-lisp/comp.el
   site-lisp:
     source: site-lisp