Date: Fri, 8 Jan 2021 16:44:11 GMT From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 14a16fd3e7ec - main - build: add WITHOUT_CLEAN workaround for 821aa63a0940 Message-ID: <202101081644.108GiBCV014392@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=14a16fd3e7eced5b63ffd85fdac4334e30012e84 commit 14a16fd3e7eced5b63ffd85fdac4334e30012e84 Author: Kyle Evans <kevans@FreeBSD.org> AuthorDate: 2021-01-08 15:18:46 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101081644.108GiBCV014392>