X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/a26e62ae81eb983691eea2e93cad5370a73ac517..df4f4e1787b6f2982f1e6472677769adc6014b48:/packages/emacs/build.sh

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index 7d7c2ee4..025f3130 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -1,49 +1,46 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
-TERMUX_PKG_VERSION=24.5
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL=http://ftp.gnu.org/pub/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="ncurses"
-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 --without-all"
-TERMUX_PKG_HOSTBUILD="yes"
-
-# Note that we remove leim:
-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.* share/emacs/${TERMUX_PKG_VERSION}/leim"
-
-# http://www.gnu.org/software/emacs/manual/html_node/elisp/Building-Emacs.html#Building-Emacs
-# "Compilation of the C source files in the src directory produces an executable file called temacs, also called a
-# bare impure Emacs. It contains the Emacs Lisp interpreter and I/O routines, but not the editing commands.
-# The command temacs -l loadup would run temacs and direct it to load loadup.el. The loadup library loads additional Lisp libraries,
-# which set up the normal Emacs editing environment. After this step, the Emacs executable is no longer bare.
-# Because it takes some time to load the standard Lisp files, the temacs executable usually isn't run directly by users. Instead, as
-# one of the last steps of building Emacs, the command 'temacs -batch -l loadup dump' is run. The special 'dump' argument causes temacs
-# to dump out an executable program, called emacs, which has all the standard Lisp files preloaded. (The '-batch' argument prevents
-# temacs from trying to initialize any of its data on the terminal, so that the tables of terminal information are empty in the dumped Emacs.)"
-
-########## FROM src/Makefile:
-## The dumped Emacs is as functional and more efficient than
-## bootstrap-emacs, so we replace the latter with the former.
-## Strictly speaking, emacs does not depend directly on all of $lisp,
-## since not all pieces are used on all platforms.  But DOC depends
-## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here.
-# emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el
-# if test "$(CANNOT_DUMP)" = "yes"; then \
-# 	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); \
-# fi
- 
-# so emacs => temacs, and then it tries to execute emacs, leading to error
-
-# We can build without dump, but a bootstrap-emacs is still needed to produce bytecode-compiled (platform-independent) emacs lisp .elc files.
+TERMUX_PKG_VERSION=25.1
+TERMUX_PKG_SRCURL=http://ftpmirror.gnu.org/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"
+# 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.*"
+
+# Remove ctags from the emacs package to prevent conflicting with
+# the Universal Ctags from the 'ctags' package (the bin/etags
+# program still remain in the emacs package):
+TERMUX_PKG_RM_AFTER_INSTALL+=" bin/ctags share/man/man1/ctags.1"
+
+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 () {
-	$TERMUX_PKG_SRCDIR/configure $TERMUX_PKG_EXTRA_CONFIGURE_ARGS
-	make
+	# Build a bootstrap-emacs binary to be used in termux_step_post_configure.
+	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 () {
@@ -54,10 +51,5 @@ termux_step_post_configure () {
 }
 
 termux_step_post_make_install () {
-	rm $TERMUX_PREFIX/bin/emacs $TERMUX_PREFIX/bin/emacs-$TERMUX_PKG_VERSION
-	echo "#!/$TERMUX_PREFIX/bin/sh" > $TERMUX_PREFIX/bin/emacs
-	echo "exec temacs -l loadup \$@" >> $TERMUX_PREFIX/bin/emacs
-	chmod +x $TERMUX_PREFIX/bin/emacs
-	cp $TERMUX_PKG_BUILDDIR/src/temacs $TERMUX_PREFIX/bin/temacs
+	cp $TERMUX_PKG_BUILDER_DIR/site-init.el $TERMUX_PREFIX/share/emacs/${TERMUX_PKG_VERSION}/lisp/emacs-lisp/
 }
-