From owner-svn-src-stable-11@freebsd.org  Sat Jul 29 17:30:26 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7E69DC7857;
 Sat, 29 Jul 2017 17:30:26 +0000 (UTC) (envelope-from kp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A4A8B71EE8;
 Sat, 29 Jul 2017 17:30:26 +0000 (UTC) (envelope-from kp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6THUPtn068698;
 Sat, 29 Jul 2017 17:30:25 GMT (envelope-from kp@FreeBSD.org)
Received: (from kp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6THUP1C068696;
 Sat, 29 Jul 2017 17:30:25 GMT (envelope-from kp@FreeBSD.org)
Message-Id: <201707291730.v6THUP1C068696@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org
 using -f
From: Kristof Provost <kp@FreeBSD.org>
Date: Sat, 29 Jul 2017 17:30:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r321687 - stable/11/lib/libsysdecode
X-SVN-Group: stable-11
X-SVN-Commit-Author: kp
X-SVN-Commit-Paths: stable/11/lib/libsysdecode
X-SVN-Commit-Revision: 321687
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Jul 2017 17:30:27 -0000

Author: kp
Date: Sat Jul 29 17:30:25 2017
New Revision: 321687
URL: https://svnweb.freebsd.org/changeset/base/321687

Log:
  MFC r321370
  
  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:
  stable/11/lib/libsysdecode/Makefile
  stable/11/lib/libsysdecode/mkioctls
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libsysdecode/Makefile
==============================================================================
--- stable/11/lib/libsysdecode/Makefile	Sat Jul 29 17:00:23 2017	(r321686)
+++ stable/11/lib/libsysdecode/Makefile	Sat Jul 29 17:30:25 2017	(r321687)
@@ -121,7 +121,7 @@ tables.h: mktables
 ioctl.c: .PHONY
 .endif
 ioctl.c: mkioctls .META
-	env MACHINE=${MACHINE} CPP="${CPP}" \
+	env MACHINE=${MACHINE} CPP="${CPP}" MK_PF="${MK_PF}" \
 		/bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
 
 beforedepend: ioctl.c tables.h

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