From owner-dev-commits-src-branches@freebsd.org Wed Jan 20 14:45:09 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 C75E54F894B; Wed, 20 Jan 2021 14:45:09 +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 4DLSx12qZwz4r5f; Wed, 20 Jan 2021 14:45:09 +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 46D3A1B308; Wed, 20 Jan 2021 14:45:05 +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 10KEj5k8019540; Wed, 20 Jan 2021 14:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10KEj5Zr019539; Wed, 20 Jan 2021 14:45:05 GMT (envelope-from git) Date: Wed, 20 Jan 2021 14:45:05 GMT Message-Id: <202101201445.10KEj5Zr019539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 4046f57601ea - stable/12 - pfctl: Fix NOCLEAN build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4046f57601eaa0bcd1ec8496e1280939b948aa46 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2021 14:45:10 -0000 The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4046f57601eaa0bcd1ec8496e1280939b948aa46 commit 4046f57601eaa0bcd1ec8496e1280939b948aa46 Author: Kristof Provost AuthorDate: 2021-01-19 12:48:31 +0000 Commit: Kristof Provost 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