X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1e3008e4e9b87143bc2bd1b8f18b254927937e22..722ed12d69bc2e936b4f437921b13cef76d2b596:/packages/emacs/build.sh

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index c7483654..23520c4d 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -1,15 +1,18 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
-TERMUX_PKG_VERSION=25.0.92
-TERMUX_PKG_BUILD_REVISION=4
-TERMUX_PKG_SRCURL=ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_VERSION=25.1
+TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33
 TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no --without-gconf --without-gsettings --with-gnutls --with-xml2"
 # Ensure use of system malloc:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_sanitize_address=yes"
 # Prevent configure from adding -nopie:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_prog_cc_nopie=no"
-TERMUX_PKG_HOSTBUILD="yes"
+# Prevent linking against libelf:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_elf_elf_begin=no"
+TERMUX_PKG_HOSTBUILD=yes
+TERMUX_PKG_KEEP_INFOPAGES=yes
 
 # Remove some irrelevant files:
 TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/images share/applications/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.icon bin/grep-changelog share/man/man1/grep-changelog.1.gz share/emacs/${TERMUX_PKG_VERSION}/etc/refcards share/emacs/${TERMUX_PKG_VERSION}/etc/tutorials/TUTORIAL.*"
@@ -23,14 +26,21 @@ termux_step_post_extract_package () {
 	# XXX: We have to start with new host build each time
 	#      to avoid build error when cross compiling.
 	rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
+
+	# We cannot run a dumped emacs on Android 5.0+ due to the pie requirement.
+	# Also, the native emacs we build (bootstrap-emacs) cannot used dumps when
+	# building inside docker: https://github.com/docker/docker/issues/22801
+	export CANNOT_DUMP=yes
 }
 
 termux_step_host_build () {
 	# Build a bootstrap-emacs binary to be used in termux_step_post_configure.
-	$TERMUX_PKG_SRCDIR/configure --prefix=$TERMUX_PREFIX --without-x --with-xpm=no --with-jpeg=no \
-	                             --with-png=no --with-tiff=no --without-gconf --without-gsettings --without-all
-	make
-	export CANNOT_DUMP=yes
+	local NATIVE_PREFIX=$TERMUX_PKG_TMPDIR/emacs-native
+	mkdir -p $NATIVE_PREFIX/share/emacs/$TERMUX_PKG_VERSION
+	ln -s $TERMUX_PKG_SRCDIR/lisp $NATIVE_PREFIX/share/emacs/$TERMUX_PKG_VERSION/lisp
+
+	$TERMUX_PKG_SRCDIR/configure --prefix=$NATIVE_PREFIX --without-all --with-x-toolkit=no
+	make -j $TERMUX_MAKE_PROCESSES
 }
 
 termux_step_post_configure () {