From owner-dev-commits-src-all@freebsd.org Fri Jan 8 16:44:11 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C3A9C4CEED6; Fri, 8 Jan 2021 16:44:11 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DC87v59Klz4cKc; Fri, 8 Jan 2021 16:44:11 +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 A44A726986; Fri, 8 Jan 2021 16:44:11 +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 108GiBN3014393; Fri, 8 Jan 2021 16:44:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 108GiBCV014392; Fri, 8 Jan 2021 16:44:11 GMT (envelope-from git) Date: Fri, 8 Jan 2021 16:44:11 GMT Message-Id: <202101081644.108GiBCV014392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 14a16fd3e7ec - main - build: add WITHOUT_CLEAN workaround for 821aa63a0940 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14a16fd3e7eced5b63ffd85fdac4334e30012e84 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2021 16:44:11 -0000 The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=14a16fd3e7eced5b63ffd85fdac4334e30012e84 commit 14a16fd3e7eced5b63ffd85fdac4334e30012e84 Author: Kyle Evans AuthorDate: 2021-01-08 15:18:46 +0000 Commit: Kyle Evans CommitDate: 2021-01-08 16:43:53 +0000 build: add WITHOUT_CLEAN workaround for 821aa63a0940 The *w variants of ncurses directories went away, and the remaining names build the widechar variants instead of non-widechar variants. As such, the entire ncurses tree should be regenerated. Key off of lib/ncurses/ncursesw being present and remove the whole ncurses hierarchy if it is. Reviewed by: emaste (IRC) --- tools/build/depend-cleanup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 0b3ff9bcc635..23bedee1ea26 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -64,3 +64,9 @@ if [ -e "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o ] && \ echo "Removing old pf_ruleset dependecy file" rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o fi + +# 20210108 821aa63a0940 non-widechar version of ncurses removed +if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then + echo "Removing stale ncurses objects" + rm -rf "$OBJTOP"/lib/ncurses "$OBJTOP"/obj-lib32/lib/ncurses +fi