emacs: ac_cv_func_setrlimit=no to make termux-am work within emacs (#2239)

[termux-packages] / packages / emacs / build.sh

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index 23520c4..eae250f 100644 (file)
--- 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.1
+TERMUX_PKG_VERSION=25.3
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SHA256=253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b
 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"
+# "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,10 @@ 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"
+# disable setrlimit function to make termux-am work from within emacs
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_setrlimit=no"
 TERMUX_PKG_HOSTBUILD=yes
 TERMUX_PKG_KEEP_INFOPAGES=yes
 
@@ -27,6 +34,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 +58,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 () {