Date: Wed, 20 Jan 2021 14:45:05 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4046f57601ea - stable/12 - pfctl: Fix NOCLEAN build Message-ID: <202101201445.10KEj5Zr019539@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4046f57601eaa0bcd1ec8496e1280939b948aa46 commit 4046f57601eaa0bcd1ec8496e1280939b948aa46 Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2021-01-19 12:48:31 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2021-01-20 14:16:05 +0000 pfctl: Fix NOCLEAN build We've created a new pf_ruleset.c file for pfctl and no longer use the kernel vrsion, but the build system doesn't handle this dependency change correctly. Delete the dependency file if it contains the kernel version of the file. (modified from commit c38e59ce1b0a6c030a942d0814d581dbd7f67e3c) --- Makefile.inc1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5f7462260240..ca842d182af2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1001,6 +1001,15 @@ _cleanobj_fast_depend_hack: .PHONY ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libomp/.depend.${f}.*}; \ fi .endfor +# 20201224 2afa221f694 Stop sharing pf_ruleset.c with the kernel +.for f in pf_ruleset + @if [ -e "${OBJTOP}"/sbin/pfctl/.depend.${f}.o ] && \ + egrep -qw "sys/netpfil/pf/${f}.c" \ + "${OBJTOP}"/sbin/pfctl/.depend.${f}.o; then + echo "Removing old ${f} dependency file" + rm -rf "${OBJTOP}"/sbin/pfctl/.depend.${f}.o + fi +.endfor _worldtmp: .PHONY @echo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101201445.10KEj5Zr019539>