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

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index dc330bfa..78c3ed53 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -1,9 +1,12 @@
-TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
+TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
-TERMUX_PKG_VERSION=25.0.95
-TERMUX_PKG_BUILD_REVISION=2
-TERMUX_PKG_SRCURL=ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_VERSION=25.2
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SHA256=59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa
+TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
+# "undefined reference to `__muloti4":
+TERMUX_PKG_CLANG=no
 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"
@@ -11,6 +14,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_sanitize_address=yes"
 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"
+# implemented using dup3(), which fails if oldfd == newfd
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" gl_cv_func_dup2_works=no"
 TERMUX_PKG_HOSTBUILD=yes
 TERMUX_PKG_KEEP_INFOPAGES=yes
 
@@ -27,6 +32,10 @@ termux_step_post_extract_package () {
 	#      to avoid build error when cross compiling.
 	rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
 
+	# Termux only use info pages for emacs. Remove the info directory
+	# to get a clean Info directory file dir.
+	rm -Rf $TERMUX_PREFIX/share/info
+
 	# 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
@@ -47,7 +56,7 @@ 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
 	# Update timestamps so that the binaries does not get rebuilt:
-	$TERMUX_TOUCH -d "next hour" $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
+	touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/lib-src/make-docfile
 }
 
 termux_step_post_make_install () {