From 9fc0086f05724e99d6c1d1c7346baee7865867fa Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 3 Oct 2016 09:55:56 -0400 Subject: [PATCH] zsh: Add the curses, socket and zprof modules Also mark $PREFIX/etc/zshrc as a configuration file. --- packages/zsh/build.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh index bdd2c70e0..9e57827c5 100644 --- a/packages/zsh/build.sh +++ b/packages/zsh/build.sh @@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE="http://www.zsh.org/" TERMUX_PKG_DESCRIPTION="Shell designed for interactive use, although it is also a powerful scripting language" _FOLDERVERSION=5.2 TERMUX_PKG_VERSION=${_FOLDERVERSION}.0 -TERMUX_PKG_BUILD_REVISION=2 +TERMUX_PKG_BUILD_REVISION=3 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/zsh/zsh/$_FOLDERVERSION/zsh-${_FOLDERVERSION}.tar.xz TERMUX_PKG_RM_AFTER_INSTALL="bin/zsh-${_FOLDERVERSION}" TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-tools, command-not-found" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-etcdir=$TERMUX_PREFIX/etc --disable-gdbm --disable-pcre ac_cv_header_utmp_h=no" +TERMUX_PKG_CONFFILES="etc/zshrc" # Below needed to force dynamically loaded binary modules, but does not currently work: # TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" zsh_cv_shared_environ=yes" @@ -17,10 +18,12 @@ termux_step_post_configure () { # and you will need to edit config.modules to make any other modules available." # Since we build zsh non-dynamically (since dynamic loading doesn't work on Android when enabled), # we need to explicitly enable the additional modules we want. - # - The files module is needed by `compinstall`, see https://github.com/termux/termux-packages/issues/61: + # - The files module is needed by `compinstall` (https://github.com/termux/termux-packages/issues/61). # - The regex module seems to be used by several extensions. - perl -p -i -e "s|files.mdd link=no|files.mdd link=static|" $TERMUX_PKG_BUILDDIR/config.modules - perl -p -i -e "s|regex.mdd link=no|regex.mdd link=static|" $TERMUX_PKG_BUILDDIR/config.modules + # - The curses, socket and zprof modules was desired by BrainDamage on IRC (#termux). + for module in files regex curses zprof socket; do + perl -p -i -e "s|${module}.mdd link=no|${module}.mdd link=static|" $TERMUX_PKG_BUILDDIR/config.modules + done } termux_step_post_make_install () {