Date: Wed, 6 Oct 2021 07:55:29 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cb0ed5261c3c - main - shells/bash: fix compilation after libncurses split in base Message-ID: <202110060755.1967tTG4092307@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb0ed5261c3c5308001cedf8ca38154dbff979cb commit cb0ed5261c3c5308001cedf8ca38154dbff979cb Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2021-10-06 07:51:11 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2021-10-06 07:55:26 +0000 shells/bash: fix compilation after libncurses split in base bash actually only requires libtinfo, but up to recent change in 14.0-CURRENT, libtinfo and libncurses were bundled into one single libs, so linking only to libncurses was not a problem. By telling bash to link to libtinfo and not to libncurses, it works on both system where ncurses has been split and those without the split as there is a libtinfow.so symlink to libncursesw.so on those. --- shells/bash/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 61e2e3b0bcbf..19c1275f55ab 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -55,7 +55,7 @@ CONFIGURE_ARGS+= --without-bash-malloc \ --enable-disabled-builtins \ --with-libiconv-prefix=${ICONV_PREFIX} -MAKE_ARGS+= TERMCAP_LIB=-lncursesw +MAKE_ARGS+= TERMCAP_LIB=-ltinfow .if empty(PKGNAMESUFFIX) CONFLICTS+= bash-static-[0-9]*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110060755.1967tTG4092307>