From 1c446941873761f34f2a473cfa25a3329a6aa934 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 27 Dec 2021 15:21:07 +0100 Subject: [PATCH] Revert "emacs: remove setjmp workaround" This reverts commit 67babc6702ce74e7565141447f774f39e0fa5757. Unfortunately the segfault still seem to happen. --- packages/emacs/build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh index ff6eda08e..358459414 100644 --- a/packages/emacs/build.sh +++ b/packages/emacs/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=27.2 -TERMUX_PKG_REVISION=8 +TERMUX_PKG_REVISION=9 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9 TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2, libjansson" @@ -49,6 +49,12 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_elf_elf_begin=no" 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" +if [ "$TERMUX_ARCH" == "arm" ] || [ "$TERMUX_ARCH" == "i686" ]; then + # setjmp does not work properly on 32bit android: + # https://github.com/termux/termux-packages/issues/2599 + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_func__setjmp=no" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_func_sigsetjmp=no" +fi TERMUX_PKG_HOSTBUILD=true # Remove some irrelevant files: