From fbb213434b7de36f543471a8dfa8163e7272ed38 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 27 Feb 2019 22:42:13 +0100 Subject: [PATCH] Keep update to bash 5 and readline 8 in sync --- packages/bash/build.sh | 2 +- packages/readline/build.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/bash/build.sh b/packages/bash/build.sh index 9c538f823..615f2d4e1 100644 --- a/packages/bash/build.sh +++ b/packages/bash/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/bash/ TERMUX_PKG_DESCRIPTION="A sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh)" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools, command-not-found" +TERMUX_PKG_DEPENDS="ncurses, readline (>= 8.0), libandroid-support, termux-tools, command-not-found" _MAIN_VERSION=5.0 _PATCH_VERSION=2 TERMUX_PKG_SHA256=b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d diff --git a/packages/readline/build.sh b/packages/readline/build.sh index 99a3d15e0..25847c3e7 100644 --- a/packages/readline/build.sh +++ b/packages/readline/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html" TERMUX_PKG_DESCRIPTION="Library that allow users to edit command lines as they are typed in" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_DEPENDS="libandroid-support, ncurses" +TERMUX_PKG_CONFLICTS="bash (<< 5.0)" TERMUX_PKG_VERSION="8.0" TERMUX_PKG_SHA256=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/readline/readline-${TERMUX_PKG_VERSION}.tar.gz