Author: emaste Date: Wed Aug 26 04:01:06 2020 New Revision: 364802 URL: https://svnweb.freebsd.org/changeset/base/364802
Log: Apply a big hammer for stale pre-OpenZFS files -DNO_CLEAN builds have had trouble across the OpenZFS import. It's not worth the effort to try to address this with any granularity; instead, just trigger on a .depend file indicating a tree from before the import, and remove the whole cddl object tree. Reviewed by: mmacy, kevans Differential Revision: https://reviews.freebsd.org/D26189 Modified: head/tools/build/depend-cleanup.sh Modified: head/tools/build/depend-cleanup.sh ============================================================================== --- head/tools/build/depend-cleanup.sh Wed Aug 26 03:41:29 2020 (r364801) +++ head/tools/build/depend-cleanup.sh Wed Aug 26 04:01:06 2020 (r364802) @@ -43,3 +43,11 @@ clean_dep lib/libc shm_open S clean_dep lib/libomp ittnotify_static c # 20200414 r359930 closefrom clean_dep lib/libc closefrom S + +# 20200826 r364746 OpenZFS merge, apply a big hammer (remove whole tree) +if [ -e "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o ] && \ + egrep -qw "cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c" \ + "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o; then + echo "Removing old ZFS tree" + rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl +fi _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
