Module Name:    src
Committed By:   rillig
Date:           Sat Apr 20 13:24:49 UTC 2024

Modified Files:
        src/bin: Makefile.inc
        src/sbin: Makefile.inc
        src/sbin/fsck_lfs: Makefile
        src/sbin/newfs_lfs: Makefile
        src/sbin/resize_ffs: Makefile
        src/usr.bin: Makefile.inc
        src/usr.bin/kdump: Makefile
        src/usr.bin/ktruss: Makefile
        src/usr.bin/rump_server: Makefile
        src/usr.sbin: Makefile.inc

Log Message:
{usr.,}{s,}bin: replace LINT_SUPPORTED with the standard NOLINT

While here, re-enable lint in those cases where lint was skipped due to
a bug in interpreting abstract types, which was fixed in cgram.y 1.469
from 2023-08-02.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/bin/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/sbin/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/sbin/fsck_lfs/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sbin/newfs_lfs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sbin/resize_ffs/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/Makefile.inc
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/kdump/Makefile
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/ktruss/Makefile
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/rump_server/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/Makefile.inc
diff -u src/bin/Makefile.inc:1.18 src/bin/Makefile.inc:1.19
--- src/bin/Makefile.inc:1.18	Sat Oct  9 21:06:31 2021
+++ src/bin/Makefile.inc	Sat Apr 20 13:24:48 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.18 2021/10/09 21:06:31 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.19 2024/04/20 13:24:48 rillig Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>		# for MKDYNAMICROOT definition
@@ -10,6 +10,6 @@ BINDIR?=	/bin
 LDSTATIC?=	-static
 .endif
 
-.if ${MKLINT} != "no" && ${LINT_SUPPORTED:Uyes} == "yes"
+.if ${MKLINT} != "no" && !defined(NOLINT)
 realall: lint
 .endif

Index: src/sbin/Makefile.inc
diff -u src/sbin/Makefile.inc:1.23 src/sbin/Makefile.inc:1.24
--- src/sbin/Makefile.inc:1.23	Tue Sep 14 20:13:03 2021
+++ src/sbin/Makefile.inc	Sat Apr 20 13:24:48 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.23 2021/09/14 20:13:03 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.24 2024/04/20 13:24:48 rillig Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/8/93
 
 .include <bsd.own.mk>		# for MKDYNAMICROOT definition
@@ -10,6 +10,6 @@ BINDIR?=	/sbin
 LDSTATIC?=	-static
 .endif
 
-.if ${MKLINT} != "no" && ${LINT_SUPPORTED:Uyes} == "yes"
+.if ${MKLINT} != "no" && !defined(NOLINT)
 realall: lint
 .endif

Index: src/sbin/fsck_lfs/Makefile
diff -u src/sbin/fsck_lfs/Makefile:1.23 src/sbin/fsck_lfs/Makefile:1.24
--- src/sbin/fsck_lfs/Makefile:1.23	Tue Sep 14 20:13:03 2021
+++ src/sbin/fsck_lfs/Makefile	Sat Apr 20 13:24:48 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2021/09/14 20:13:03 rillig Exp $
+#	$NetBSD: Makefile,v 1.24 2024/04/20 13:24:48 rillig Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 WARNS?=	3	# XXX: sign-compare issues
@@ -19,9 +19,4 @@ CPPFLAGS+=-I${.CURDIR} -I${FSCK} -DIN_FS
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
-# As of 2021-09-14, lint does not recognize the types as equal, but it should.
-# vnode.c(104): error: redeclaration of register_vget [27]
-# vnode.h(75): previous declaration of register_vget [260]
-LINT_SUPPORTED=	no
-
 .include <bsd.prog.mk>

Index: src/sbin/newfs_lfs/Makefile
diff -u src/sbin/newfs_lfs/Makefile:1.15 src/sbin/newfs_lfs/Makefile:1.16
--- src/sbin/newfs_lfs/Makefile:1.15	Tue Sep 14 20:13:03 2021
+++ src/sbin/newfs_lfs/Makefile	Sat Apr 20 13:24:49 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2021/09/14 20:13:03 rillig Exp $
+#	$NetBSD: Makefile,v 1.16 2024/04/20 13:24:49 rillig Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 WARNS?=	3	# XXX: sign-compare issues
@@ -25,9 +25,4 @@ DPADD+=${LIBPROP}
 
 CPPFLAGS+=-I${FSCK_LFS} -I${FSCK} # -DNDEBUG # -DVERBOSE_BLOCKMAP
 
-# As of 2021-09-14, lint does not recognize the types as equal, but it should.
-# vnode.c(104): error: redeclaration of register_vget [27]
-# vnode.h(75): previous declaration of register_vget [260]
-LINT_SUPPORTED=	no
-
 .include <bsd.prog.mk>

Index: src/sbin/resize_ffs/Makefile
diff -u src/sbin/resize_ffs/Makefile:1.7 src/sbin/resize_ffs/Makefile:1.8
--- src/sbin/resize_ffs/Makefile:1.7	Tue Sep 14 20:13:03 2021
+++ src/sbin/resize_ffs/Makefile	Sat Apr 20 13:24:49 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2021/09/14 20:13:03 rillig Exp $
+#	$NetBSD: Makefile,v 1.8 2024/04/20 13:24:49 rillig Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,4 @@ LDADD+= -lutil
 .PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
 .PATH: ${NETBSDSRCDIR}/sbin/fsck
 
-# resize_ffs.c(90): error: cannot take size/alignment of incomplete type [143]
-LINT_SUPPORTED=	no
-
 .include <bsd.prog.mk>

Index: src/usr.bin/Makefile.inc
diff -u src/usr.bin/Makefile.inc:1.11 src/usr.bin/Makefile.inc:1.12
--- src/usr.bin/Makefile.inc:1.11	Sun Aug 22 22:24:11 2021
+++ src/usr.bin/Makefile.inc	Sat Apr 20 13:24:49 2024
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile.inc,v 1.11 2021/08/22 22:24:11 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.12 2024/04/20 13:24:49 rillig Exp $
 #	from: @(#)Makefile.inc	8.1 (Berkeley) 6/6/93
 
 WARNS?=	5
 BINDIR?=/usr/bin
 
 .include <bsd.own.mk>
-.if ${MKLINT} != "no" && ${LINT_SUPPORTED:Uyes} == "yes"
+.if ${MKLINT} != "no" && !defined(NOLINT)
 realall: lint
 .endif

Index: src/usr.bin/kdump/Makefile
diff -u src/usr.bin/kdump/Makefile:1.36 src/usr.bin/kdump/Makefile:1.37
--- src/usr.bin/kdump/Makefile:1.36	Sat Jun  3 08:52:59 2023
+++ src/usr.bin/kdump/Makefile	Sat Apr 20 13:24:49 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36 2023/06/03 08:52:59 lukem Exp $
+#	$NetBSD: Makefile,v 1.37 2024/04/20 13:24:49 rillig Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 .include <bsd.own.mk>		# for MKDYNAMICROOT & NETBSDSRCDIR
@@ -11,7 +11,7 @@ MAN=	kdump.1 ioctlprint.1
 SRCS=	kdump.c subr.c setemul.c siginfo.c
 .PATH:	${NETBSDSRCDIR}/usr.bin/ktrace
 CLEANFILES+=siginfo.c
-LINT_SUPPORTED=	no	# kdump-ioctl.c defines uio_t twice.
+NOLINT=	# kdump-ioctl.c defines uio_t twice.
 
 .if (${MKDYNAMICROOT} == "no")
 LDSTATIC?=-static

Index: src/usr.bin/ktruss/Makefile
diff -u src/usr.bin/ktruss/Makefile:1.33 src/usr.bin/ktruss/Makefile:1.34
--- src/usr.bin/ktruss/Makefile:1.33	Sat Jun  3 08:53:00 2023
+++ src/usr.bin/ktruss/Makefile	Sat Apr 20 13:24:49 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2023/06/03 08:53:00 lukem Exp $
+#	$NetBSD: Makefile,v 1.34 2024/04/20 13:24:49 rillig Exp $
 
 NOMAN=		# defined
 
@@ -7,7 +7,7 @@ NOMAN=		# defined
 PROG=		ktruss
 SRCS=		ktrace.c dump.c subr.c misc.c setemul.c
 CLEANFILES+=	misc.c misc.h
-LINT_SUPPORTED=	no	# ktruss-ioctl.c defines uio_t twice.
+NOLINT=		# ktruss-ioctl.c defines uio_t twice.
 
 .if (${MKDYNAMICROOT} == "no")
 LDSTATIC?=-static

Index: src/usr.bin/rump_server/Makefile
diff -u src/usr.bin/rump_server/Makefile:1.17 src/usr.bin/rump_server/Makefile:1.18
--- src/usr.bin/rump_server/Makefile:1.17	Mon Nov  1 21:37:33 2021
+++ src/usr.bin/rump_server/Makefile	Sat Apr 20 13:24:49 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2021/11/01 21:37:33 nia Exp $
+#	$NetBSD: Makefile,v 1.18 2024/04/20 13:24:49 rillig Exp $
 #
 
 NOFULLRELRO=	yes
@@ -8,7 +8,7 @@ NOFULLRELRO=	yes
 PROG=		rump_server
 SRCS=		rump_allserver.c
 NOMAN=		installed by ../rump_allserver
-LINT_SUPPORTED=	no	# LDADD contains -Wl,...
+NOLINT=		# LDADD contains -Wl,...
 
 LDADD+= \
     -Wl,--whole-archive \

Index: src/usr.sbin/Makefile.inc
diff -u src/usr.sbin/Makefile.inc:1.8 src/usr.sbin/Makefile.inc:1.9
--- src/usr.sbin/Makefile.inc:1.8	Tue Sep 14 20:36:02 2021
+++ src/usr.sbin/Makefile.inc	Sat Apr 20 13:24:49 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.8 2021/09/14 20:36:02 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2024/04/20 13:24:49 rillig Exp $
 #	from: @(#)Makefile.inc	8.1 (Berkeley) 6/6/93
 
 BINDIR?=	/usr/sbin
@@ -6,6 +6,6 @@ WARNS?=		4
 CPPFLAGS+=	-D_KERNTYPES
 
 .include <bsd.own.mk>
-.if ${MKLINT} != "no" && ${LINT_SUPPORTED:Uyes} == "yes"
+.if ${MKLINT} != "no" && !defined(NOLINT)
 realall: lint
 .endif

Reply via email to