From 7e05574a0f0294fe7197825bea0b1a404d0f647e Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 3 Nov 2017 23:07:11 +0100 Subject: [PATCH] fish: Use system pcre2 lib and bump revision --- packages/fish/build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/fish/build.sh b/packages/fish/build.sh index 88dbe7cf..118646f2 100644 --- a/packages/fish/build.sh +++ b/packages/fish/build.sh @@ -1,14 +1,17 @@ TERMUX_PKG_HOMEPAGE=http://fishshell.com/ TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use" TERMUX_PKG_VERSION=2.6.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb # 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" +TERMUX_PKG_DEPENDS="ncurses, libandroid-support, ncurses-utils, man, bc, pcre2" TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_file__proc_self_stat=yes" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +ac_cv_file__proc_self_stat=yes +--without-included-pcre2 +" termux_step_pre_configure() { CXXFLAGS+=" $CPPFLAGS" -- 2.11.0