From 93104a9b2f3bb1c57cee1c065a9a7662479f3daf Mon Sep 17 00:00:00 2001
From: rillig <rillig@NetBSD.org>
Date: Sat, 16 Jan 2021 22:18:14 +0000
Subject: [PATCH] lint: remove custom stdbool.h for strict bool mode again

Adding it broke the official builds.
---
 distrib/sets/lists/comp/mi   | 4 +---
 etc/mtree/NetBSD.dist.base   | 3 +--
 usr.bin/xlint/xlint/Makefile | 8 ++++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 979971dddf15..1af3e7e409af 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2369 2021/01/16 16:03:46 rillig Exp $
+#	$NetBSD: mi,v 1.2370 2021/01/16 22:18:14 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -4011,8 +4011,6 @@
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_shatest.debug	comp-obsolete	openssl=11,obsolete
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_x509v3test.debug	comp-obsolete	openssl=11,obsolete
 ./usr/libdata/ldscripts/kmodule			comp-util-share		binutils,kmod
-./usr/libdata/lint/strict-bool			comp-c-bin		lint
-./usr/libdata/lint/strict-bool/stdbool.h	comp-c-bin		lint
 ./usr/libdata/lint/llib-larchive.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lasn1.ln		comp-krb5-lintlib	lint,kerberos
 ./usr/libdata/lint/llib-lbind9.ln		comp-bind-lintlib	lint
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index 501f23bbb6a3..d1ad901475ac 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.231 2021/01/16 20:30:05 rillig Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.232 2021/01/16 22:18:14 rillig Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -297,7 +297,6 @@
 ./usr/libdata/firmware/bcm43xx
 ./usr/libdata/ldscripts
 ./usr/libdata/lint
-./usr/libdata/lint/strict-bool
 ./usr/libexec
 ./usr/libexec/ching
 ./usr/libexec/lpr
diff --git a/usr.bin/xlint/xlint/Makefile b/usr.bin/xlint/xlint/Makefile
index fcf89fed785e..58ec59f084f0 100644
--- a/usr.bin/xlint/xlint/Makefile
+++ b/usr.bin/xlint/xlint/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2021/01/16 16:03:46 rillig Exp $
+#	$NetBSD: Makefile,v 1.18 2021/01/16 22:18:14 rillig Exp $
 
 .PATH:		${.CURDIR}/../lint1
 .PATH:		${.CURDIR}/../../mkdep
@@ -16,8 +16,8 @@ DPADD+=		${LIBUTIL}
 LDADD+=		-lutil
 .endif
 
-FILES+=		strict-bool-stdbool.h
-FILESDIR=	/usr/libdata/lint/strict-bool
-FILESNAME_strict-bool-stdbool.h= stdbool.h
+#FILES+=		strict-bool-stdbool.h
+#FILESDIR=	/usr/libdata/lint/strict-bool
+#FILESNAME_strict-bool-stdbool.h= stdbool.h
 
 .include <bsd.prog.mk>