From owner-svn-src-stable@freebsd.org  Tue Jan  3 23:21:35 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 48F97C9D8DE;
 Tue,  3 Jan 2017 23:21:35 +0000 (UTC)
 (envelope-from bdrewery@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 10F39155A;
 Tue,  3 Jan 2017 23:21:34 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v03NLYkd053311;
 Tue, 3 Jan 2017 23:21:34 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03NLYr7053309;
 Tue, 3 Jan 2017 23:21:34 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201701032321.v03NLYr7053309@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 3 Jan 2017 23:21:34 +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: r311198 - in stable/11: . lib/libsysdecode
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2017 23:21:35 -0000

Author: bdrewery
Date: Tue Jan  3 23:21:33 2017
New Revision: 311198
URL: https://svnweb.freebsd.org/changeset/base/311198

Log:
  Revert MFC of r308603.
  
  This depends on unmerged r307538 still.

Modified:
  stable/11/Makefile.inc1
  stable/11/lib/libsysdecode/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Tue Jan  3 23:10:57 2017	(r311197)
+++ stable/11/Makefile.inc1	Tue Jan  3 23:21:33 2017	(r311198)
@@ -655,6 +655,9 @@ _worldtmp: .PHONY
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
+#	XXX - These can depend on any header file.
+	rm -f ${OBJTREE}${.CURDIR}/lib/libsysdecode/ioctl.c
+	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
 .endif
 .for _dir in \
     lib lib/casper usr legacy/bin legacy/usr

Modified: stable/11/lib/libsysdecode/Makefile
==============================================================================
--- stable/11/lib/libsysdecode/Makefile	Tue Jan  3 23:10:57 2017	(r311197)
+++ stable/11/lib/libsysdecode/Makefile	Tue Jan  3 23:21:33 2017	(r311198)
@@ -36,12 +36,7 @@ CFLAGS.gcc.ioctl.c+= -Wno-unused
 
 CFLAGS.gcc+=	${CFLAGS.gcc.${.IMPSRC}}
 
-# mkioctls runs find(1) for headers so needs to rebuild every time.  This used
-# to be a hack only done in buildworld.
-.if !defined(_SKIP_BUILD)
-ioctl.c: .PHONY
-.endif
-ioctl.c: mkioctls .META
+ioctl.c: mkioctls
 	env MACHINE=${MACHINE} CPP="${CPP}" \
 		/bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}