From 77a8de768d51ad1f8065689a751266927b55b2dc Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 29 Dec 2015 19:11:46 -0500
Subject: [PATCH] zsh: Enable the files module (fixes #61)

---
 packages/zsh/.build.sh.swp | Bin 0 -> 12288 bytes
 packages/zsh/build.sh      |  14 +++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 packages/zsh/.build.sh.swp

diff --git a/packages/zsh/.build.sh.swp b/packages/zsh/.build.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..a0ee70b595ceb31d5c19ca126fe1b9779fab8945
GIT binary patch
literal 12288
zcmeI2-EJF27>1`D5ui}P1u)$Ni5BnLq*OtXwluAsV39wqlc?fkS?`X$+l*(dnb|n*
z4@gLywc-}I0nXuo3*ZcKz+J!rTmZbYcAVHk?MacSG?rfN&-}gfeBXRg)$KNp+B<YD
z_=w<lg^>H-e|@B{?vl073F%2CMhWM(=~=&S*?U&=tnJIQ3F}!}A13K>(r3E<K<D*t
zS@0~-`K+tEaReNJ7fGNrJ^$m&hc{L~Y}jd+y{q({w+~<B3T`e(z!7i+905nb5pV<?
z0Y|_Q_@5In!%O5Vczk8*^S$Zy(!zE6=q`?cBj5-)0*-(q;0QPZj({WJ2si?cfFtk{
z5=b&a=&OYM0@?rnKl}IpZ*LLOhYlbg`sqzVzJYE)KVBx}2j~lkLhnL<zd^`%P!sy|
zbwW;|6R3nD=&#oZc?vy&j-XZOL+JM<LVkw6g`PrBpaR;2u0Vgl*RNB5mB*Kmv9s(5
zI0BA<Bj5-)0{<<6$AnIQX+Dq{ZLHnANrzIKLTEE<V`(m_$4(1F8y>xN>%7O(q-ipE
zt<j(>2d!x5@Ls$hwKm)L>N-ypv)?RY*o9HcbW<vtaK(~rOzm3uZjxp6>?_B0Vwf6~
zr?EC{7^moFSe&u0PE|29n!bOHJ|yHZS$fXG53zF1elfWcZ|-e3ThUP~>a_QEF>;w2
zNp-=QNE!7~IT$8oRv3?t5+w@J*Xy>=L0)L8b6IkjV=7OEnsyn@q+qa36FQKJ(LNJQ
zB^*P?pU|enXbMz0Q;d)$HK2ZPk&89vU$@qR>y?>^4de-<_Jv?0ODvE)vsZuRgehG}
zL5m(u#F!!u+Q1%J(m>|vN4Mvg-+nY7gGb)^;-78BcMjVYMBHpgb!Ji@E2tE~nIB}E
z?BXi56waThPoq*$e3^>vBSuMT3fR^;;~ZhhjTx@jEB9KKDrM-{XV{UcZ<R$>WkTQH
zG**M$4EVMAK-<KN2gxyurzvqB=;cYGiDbY+_^S61ISu-my$L%it?$UJ#JfpLFvv2>
z3vnDGwM>!Hq%<-dV+fZ?77AIV@odj$Tr8ASieAwVFtwe|Za)zj9m|rA3eKrufR5B*
zNESNZ*S@yyt0+l>_*;W^7Mh$S1y8!11)iPJrdw$WUaRgn;#s3Q%~@8X%QyrIy9C@C
zeZbl5sj{JXF(_~V&gMlBB*jXT2-NJ{?cL77#`ZR~VAiQu9W*MW@Ut=K0R`~YsxcYs
zB_%f$DUMmJCk&}t>^+BtiNDmqD6G`xPGuFW34ju3U~(jJVy5RGNL%*~qK)|O-tK05
z>o97?8_`zhgV3`E;`Ai0YC{$?aZ)HLY;ZiXOz$u*M-}A>XJil#=+rx^#JGwe+PZ~E
z)cA}<jdn|ea|zZ$A~2;=Oc?YYNp*~~@*G>C=le|90Qt!LtWe=BHztJ)Z>jHRg|7Pa
zvo22c>~V++MU&KSDn~_QDlW}n80R+6F0R~c?YDNDozUY&7fGdLk@>nD4y8i;1w3n}
z5t^#>`9?~PCxl{vzCL#4_hc!uxf!FKcw-ZLi>FZ!Jz$wsjfV>*Z*E*Cx_cOHhtu<#
z$&s+<LI;bdcBtfimKr-_rG+~B?<)l+QNihhi#wmz-Ed{mRnQ>wKEs>A>cx@GR_AWi
z-akOq4!w@8Gc;qm=nJI4Vi_tmGB)7`^}3(i5{%4FxR$8XLpfrqS8^OP`zOSfXr73E
giErxXz<j#5)7szIYK7jE&1f_Vu=@aotnQJ20Ld$xlK=n!

literal 0
HcmV?d00001

diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh
index 4a7a60a4b..1c19f3ce6 100644
--- a/packages/zsh/build.sh
+++ b/packages/zsh/build.sh
@@ -2,13 +2,25 @@ 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=1
 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"
-# Below needed to force loadable binary modules, but does not currently work:
+
+# Below needed to force dynamically loaded binary modules, but does not currently work:
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" zsh_cv_shared_environ=yes"
 
+termux_step_post_configure () {
+	# INSTALL file: "For a non-dynamic zsh, the default is to compile the complete, compctl, zle,
+	# computil, complist, sched, # parameter, zleparameter and rlimits modules into the shell,
+	# 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:
+	perl -p -i -e "s|files.mdd link=no|files.mdd link=static|" $TERMUX_PKG_BUILDDIR/config.modules
+}
+
 termux_step_post_make_install () {
 	# /etc/zshrc - Run for interactive shells (http://zsh.sourceforge.net/Guide/zshguide02.html):
 	sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" $TERMUX_PKG_BUILDER_DIR/etc-zshrc > $TERMUX_PREFIX/etc/zshrc