From 727ffe26f724facc6cd6256ee5f3d0a8f958d148 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 3 Aug 2015 20:25:47 -0400
Subject: [PATCH] Trying to unbreak emacs

---
 packages/emacs/Makefile.in.patch     | 12 ++++++++++++
 packages/emacs/build.sh              |  4 ----
 packages/emacs/src-Makefile.in.patch | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 packages/emacs/Makefile.in.patch
 create mode 100644 packages/emacs/src-Makefile.in.patch

diff --git a/packages/emacs/Makefile.in.patch b/packages/emacs/Makefile.in.patch
new file mode 100644
index 000000000..89e1898d3
--- /dev/null
+++ b/packages/emacs/Makefile.in.patch
@@ -0,0 +1,12 @@
+diff -u -r ../emacs-24.5/Makefile.in ./Makefile.in
+--- ../emacs-24.5/Makefile.in	2015-04-02 03:23:06.000000000 -0400
++++ ./Makefile.in	2015-08-03 19:41:45.006522243 -0400
+@@ -307,7 +307,7 @@
+ 	  sed < ${srcdir}/src/epaths.in > epaths.h.$$$$		\
+ 	  -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'"$${standardlisppath}"'";' \
+ 	  -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${locallisppath}"'";' \
+-	  -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'"$${buildlisppath}"'";' \
++	  -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'"$${standardlisppath}"'";' \
+ 	  -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'		\
+ 	  -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'			\
+ 	  -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'			\
diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index e1ea24ebd..cf82c63c2 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -45,10 +45,6 @@ termux_step_host_build () {
 	make
 }
 
-termux_step_pre_configure () {
-	export CANNOT_DUMP=yes
-}
-
 termux_step_post_configure () {
 	cp $TERMUX_PKG_HOSTBUILD_DIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs
 	cp $TERMUX_PKG_HOSTBUILD_DIR/lib-src/make-docfile $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
diff --git a/packages/emacs/src-Makefile.in.patch b/packages/emacs/src-Makefile.in.patch
new file mode 100644
index 000000000..b1e2f3040
--- /dev/null
+++ b/packages/emacs/src-Makefile.in.patch
@@ -0,0 +1,15 @@
+diff -u -r ../emacs-24.5/src/Makefile.in ./src/Makefile.in
+--- ../emacs-24.5/src/Makefile.in	2015-04-02 03:23:06.000000000 -0400
++++ ./src/Makefile.in	2015-08-03 19:25:48.870287123 -0400
+@@ -434,10 +434,7 @@
+ 	  rm -f emacs$(EXEEXT); \
+ 	  ln temacs$(EXEEXT) emacs$(EXEEXT); \
+ 	else \
+-	  LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
+-	  test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
+-	  rm -f bootstrap-emacs$(EXEEXT); \
+-	  ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
++	  cp temacs emacs; \
+ 	fi
+ 
+ ## We run make-docfile twice because the command line may get too long