svn commit: r321370 - head/lib/libsysdecode

[Kristof Provost]

Author: kp
Date: Sat Jul 22 12:51:19 2017
New Revision: 321370
URL: https://svnweb.freebsd.org/changeset/base/321370

Log:
  Handle WITH/WITHOUT_PF in libsysdecode
  
  Only filter out the PF ioctls if we're building without pf support.
  Until now those were always filtered out, so truss did not show symbolic
  names for pf ioctls.
  
  Differential Revision:	https://reviews.freebsd.org/D11629

Modified:
  head/lib/libsysdecode/Makefile
  head/lib/libsysdecode/mkioctls

Modified: head/lib/libsysdecode/Makefile
==============================================================================
--- head/lib/libsysdecode/Makefile	Sat Jul 22 11:08:25 2017	(r321369)
+++ head/lib/libsysdecode/Makefile	Sat Jul 22 12:51:19 2017	(r321370)
@@ -122,7 +122,7 @@ tables.h: mktables
 ioctl.c: .PHONY
 .endif
 ioctl.c: mkioctls .META
-	env CPP="${CPP}" \
+	env CPP="${CPP}" MK_PF="${MK_PF}" \
 	    /bin/sh ${.CURDIR}/mkioctls ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} > ${.TARGET}
 
 beforedepend: ioctl.c tables.h

Modified: head/lib/libsysdecode/mkioctls
==============================================================================
--- head/lib/libsysdecode/mkioctls	Sat Jul 22 11:08:25 2017	(r321369)
+++ head/lib/libsysdecode/mkioctls	Sat Jul 22 12:51:19 2017	(r321370)
@@ -17,8 +17,14 @@ LC_ALL=C; export LC_ALL
 # XXX should we use an ANSI cpp?
 ioctl_includes=$(
 	cd $includedir
+
+	filter='tee'
+	if [ "${MK_PF}" == "no" ]; then
+		filter='egrep -v (net/pfvar|net/if_pfsync)\.h'
+	fi
+
 	find -H -s * -name '*.h' | \
-	egrep -v '(net/pfvar|net/if_pfsync)\.h' | \
+		$filter | \
 		xargs egrep -l \
 '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' |
 		awk '{printf("#include <%s>\\n", $1)}'