From 2e3293d0d581e700a1f9d0350fe054117522cff4 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Tue, 20 Jun 2017 22:09:19 +0300
Subject: Add debian/patches/dyson-unexec.patch

---
 debian/changelog                  |  7 +++++++
 debian/patches/dyson-unexec.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 36 insertions(+)
 create mode 100644 debian/patches/dyson-unexec.patch

diff --git a/debian/changelog b/debian/changelog
index d635137..d482b17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+emacs25 (25.1+1-4+dyson1) UNRELEASED; urgency=medium
+
+  * Package for Dyson
+  * Added debian/patches/dyson-unexec.patch
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Tue, 20 Jun 2017 22:08:54 +0300
+
 emacs25 (25.1+1-4) unstable; urgency=medium
 
   * Don't offer/use openssl s_client by default: "s_client is a debug
diff --git a/debian/patches/dyson-unexec.patch b/debian/patches/dyson-unexec.patch
new file mode 100644
index 0000000..e199e2e
--- /dev/null
+++ b/debian/patches/dyson-unexec.patch
@@ -0,0 +1,28 @@
+Description: use generic ELF unexec
+ unexsol causes bootstrap-emacs crash (actually ld.so itself).
+ It is probably because we use GNU ld and Sun ld.so.
+Index: emacs25-25.1+1/configure.ac
+===================================================================
+--- emacs25-25.1+1.orig/configure.ac
++++ emacs25-25.1+1/configure.ac
+@@ -1324,20 +1324,6 @@ case "$opsys" in
+   mingw32)
+    UNEXEC_OBJ=unexw32.o
+    ;;
+-  sol2-10)
+-   # Use the Solaris dldump() function, called from unexsol.c, to dump
+-   # emacs, instead of the generic ELF dump code found in unexelf.c.
+-   # The resulting binary has a complete symbol table, and is better
+-   # for debugging and other observability tools (debuggers, pstack, etc).
+-   #
+-   # If you encounter a problem using dldump(), please consider sending
+-   # a message to the OpenSolaris tools-linking mailing list:
+-   #      http://mail.opensolaris.org/mailman/listinfo/tools-linking
+-   #
+-   # It is likely that dldump() works with older Solaris too, but this has
+-   # not been tested, so for now this change is for Solaris 10 or newer.
+-   UNEXEC_OBJ=unexsol.o
+-   ;;
+ esac
+ 
+ LD_SWITCH_SYSTEM=
diff --git a/debian/patches/series b/debian/patches/series
index f09c092..30c949c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 0008-Emacs-shouldn-t-segfault-when-gcc-expects-nopie.patch
 0009-openssl-s_client-is-no-longer-a-default-for-ssl-conn.patch
+dyson-unexec.patch
-- 
cgit v1.2.3