git: 551119253819 - stable/12 - Fix dependency cleanup hack for pf_ruleset.c

Kristof Provost kp at FreeBSD.org
Fri Jan 22 16:27:51 UTC 2021


The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=5511192538198cf1d5d3a9b3ab802f2af59c798e

commit 5511192538198cf1d5d3a9b3ab802f2af59c798e
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-01-22 16:24:07 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-01-22 16:25:38 +0000

    Fix dependency cleanup hack for pf_ruleset.c
    
    In 4046f57601eaa0bcd1ec8496e1280939b948aa46 we added a dependency
    cleanup to cope with the pf_ruleset.c changes.
    
    This commit failed to include '; \' at the end of the shell lines in the
    make target, causing build failures.
    
    PR:             252910
---
 Makefile.inc1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index ca842d182af2..be0d0d2a2334 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1005,9 +1005,9 @@ _cleanobj_fast_depend_hack: .PHONY
 .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
+	    "${OBJTOP}"/sbin/pfctl/.depend.${f}.o; then \
+			echo "Removing old ${f} dependency file"; \
+			rm -rf "${OBJTOP}"/sbin/pfctl/.depend.${f}.o; \
 	fi
 .endfor
 


More information about the dev-commits-src-all mailing list