From nobody Wed Oct 06 07:55:29 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0AE7A17E1B1F; Wed, 6 Oct 2021 07:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HPRZn6thVz3vtH; Wed, 6 Oct 2021 07:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC20E1C543; Wed, 6 Oct 2021 07:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1967tTrN092308; Wed, 6 Oct 2021 07:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1967tTG4092307; Wed, 6 Oct 2021 07:55:29 GMT (envelope-from git) Date: Wed, 6 Oct 2021 07:55:29 GMT Message-Id: <202110060755.1967tTG4092307@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: cb0ed5261c3c - main - shells/bash: fix compilation after libncurses split in base List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb0ed5261c3c5308001cedf8ca38154dbff979cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb0ed5261c3c5308001cedf8ca38154dbff979cb commit cb0ed5261c3c5308001cedf8ca38154dbff979cb Author: Baptiste Daroussin AuthorDate: 2021-10-06 07:51:11 +0000 Commit: Baptiste Daroussin 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]*