ncurses/readline: remove -fexceptions hack

This commit is contained in:
Tom Yan 2019-05-14 18:53:04 +08:00 committed by Leonid Pliushch
parent 4202d0ac6e
commit 58e6d9f8ae
2 changed files with 2 additions and 6 deletions

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library for text-based user interfaces in a terminal-ind
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_VERSION=(6.1.20181117
9.22)
TERMUX_PKG_REVISION=3
TERMUX_PKG_REVISION=4
TERMUX_PKG_SHA256=(b5568d53d31787cda727f949b68bcb60c667dba5deff72bd7ade40dbe45e4b16
e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd)
TERMUX_PKG_SRCURL=(https://dl.bintray.com/termux/upstream/ncurses-${TERMUX_PKG_VERSION:0:3}-${TERMUX_PKG_VERSION:4}.tgz
@ -43,7 +43,6 @@ share/man/man7
termux_step_pre_configure() {
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-pkg-config-libdir=$PKG_CONFIG_LIBDIR"
CFLAGS+=" -fexceptions"
}
termux_step_post_make_install() {

View File

@ -4,16 +4,13 @@ TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
TERMUX_PKG_BREAKS="bash (<< 5.0)"
TERMUX_PKG_VERSION="8.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/readline/readline-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-curses --enable-multibyte bash_cv_wcwidth_broken=no"
TERMUX_PKG_EXTRA_MAKE_ARGS="SHLIB_LIBS=-lncursesw"
TERMUX_PKG_CONFFILES="etc/inputrc"
termux_step_pre_configure() {
CFLAGS+=" -fexceptions"
}
termux_step_post_make_install() {
mkdir -p $TERMUX_PREFIX/lib/pkgconfig
cp readline.pc $TERMUX_PREFIX/lib/pkgconfig/