Merge branch 'master' into snapshot

This updates snapshot to core24 Signed-off-by: Alex Murray <murray.alex@gmail.com>
alexmurray · Nov 4, 2024 · ec7ee9a · ec7ee9a
2 parents 63e91a4 + f1ae004
commit ec7ee9a
Show file tree

Hide file tree

Showing 8 changed files with 468 additions and 142 deletions.
diff --git a/emacsclient b/emacsclient
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Launch emacsclient with the most appropriate toolkit (currently gtk (for real
 # x11) or wayland)
 

diff --git a/native-comp.patch b/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") (list (concat "--sysroot=" (file-name-as-directory (getenv "SNAP"))) (concat "-B" (file-name-as-directory (getenv "SNAP")) "usr/lib/gcc/"))))
++        ((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/"))))
    "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.
diff --git a/setup-env b/setup-env
diff --git a/setup-env/Makefile b/setup-env/Makefile
@@ -0,0 +1,5 @@
+setup-env: setup-env.c
+	gcc setup-env.c -o setup-env
+
+install: setup-env
+	install -m 755 setup-env $(DESTDIR)/