X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/6250534f1ee25ae7a93cd1e06c4b3b486a962729..3787bf7c625be9fcd056ca2a840e3fa4b52f0fb0:/packages/fish/build.sh

diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index c66b64bf..20c64180 100644
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@@ -1,13 +1,23 @@
 TERMUX_PKG_HOMEPAGE=http://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
-TERMUX_PKG_VERSION=2.3.1
+TERMUX_PKG_VERSION=2.7.1
+TERMUX_PKG_SHA256=e42bb19c7586356905a58578190be792df960fa81de35effb1ca5a5a981f0c5a
 TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz
-# fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line:
-TERMUX_PKG_DEPENDS="ncurses, libgnustl, libandroid-support, ncurses-utils"
+# fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line.
+# man is needed since fish calls apropos during command completion.
+TERMUX_PKG_DEPENDS="ncurses, libandroid-support, ncurses-utils, man, bc, pcre2"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_FOLDERNAME=fish-$TERMUX_PKG_VERSION
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_file__proc_self_stat=yes
+--without-included-pcre2
+"
 
-CXXFLAGS+=" $CPPFLAGS"
+termux_step_pre_configure() {
+	CXXFLAGS+=" $CPPFLAGS"
+
+	# The column(1) utility is used by oh-my-fish, so we bundle column.c from bsdmainutils with it:
+	$CC $CFLAGS $LDFLAGS -DLINE_MAX=_POSIX2_LINE_MAX $TERMUX_PKG_BUILDER_DIR/column.c -o $TERMUX_PREFIX/bin/column
+}
 
 termux_step_post_make_install () {
 	cat >> $TERMUX_PREFIX/etc/fish/config.fish <<HERE