The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=8e35800732573de6c4bc1dd3ac420447fca96231
commit 8e35800732573de6c4bc1dd3ac420447fca96231
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2025-06-05 23:55:34 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2025-06-05 23:55:34 +0000
build: remove the last vestiges of lint support
Commit 1cbb58886a47 (shipped in 12.0.0) removed all lint infrastructure.
A bunch of NO_LINT definitions remained (perhaps as a bootstrapping
measture). Remove them.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D50704
---
Makefile.inc1 | 7 ++-----
Makefile.libcompat | 1 -
cddl/Makefile.inc | 5 -----
gnu/Makefile.inc | 5 +----
kerberos5/Makefile.inc | 2 --
lib/ncurses/ncurses/Makefile | 2 --
lib/ncurses/tinfo/Makefile | 2 --
secure/lib/libcrypto/Makefile | 1 -
secure/lib/libssh/Makefile | 2 --
secure/lib/libssl/Makefile | 2 --
targets/pseudo/bootstrap-tools/Makefile | 1 -
11 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 60010da6ad50..fc61f5ec54c6 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -767,7 +767,6 @@ BSARGS= DESTDIR= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
-DNO_CPU_CFLAGS \
- -DNO_LINT \
-DNO_PIC \
-DNO_SHARED \
MK_ASAN=no \
@@ -800,7 +799,6 @@ TMAKE= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
-DNO_CPU_CFLAGS \
- -DNO_LINT \
MK_ASAN=no \
MK_CTF=no \
MK_CLANG_EXTRAS=no \
@@ -838,7 +836,6 @@ KTMAKE= ${TIME_ENV} \
MAKEOBJDIRPREFIX= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
-DNO_CPU_CFLAGS \
- -DNO_LINT \
-DNO_PIC \
-DNO_SHARED \
MK_CTF=no \
@@ -1223,7 +1220,7 @@ _libraries:
@echo ">>> stage 4.2: building libraries"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; \
- ${WMAKE} -DNO_FSCHG MK_HTML=no -DNO_LINT MK_MAN=no \
+ ${WMAKE} -DNO_FSCHG MK_HTML=no MK_MAN=no \
MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS_SUPPORT} \
libraries
everything: .PHONY
@@ -3717,7 +3714,7 @@ XDEV_CPUTYPE?=${CPUTYPE}
XDEV_CPUTYPE?=${TARGET_CPUTYPE}
.endif
-NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \
+NOFUN=-DNO_FSCHG MK_HTML=no \
MK_MAN=no MK_NLS=no \
MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WERROR=no \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 7054cf9ee0bb..5675fa5eaff2 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -64,7 +64,6 @@ build${libcompat}: .PHONY
OBJROOT='$${OBJTOP}/' \
UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \
MAKEOBJDIRPREFIX= \
- -DNO_LINT \
-DNO_CPU_CFLAGS \
MK_ASAN=no \
MK_CTF=no \
diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
index 63768ae44a7d..dc942ed2812d 100644
--- a/cddl/Makefile.inc
+++ b/cddl/Makefile.inc
@@ -5,8 +5,3 @@ IGNORE_PRAGMA= YES
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
CFLAGS+= -DHAVE_STRLCAT -DHAVE_STRLCPY
-
-# Do not lint the CDDL stuff. It is all externally maintained and
-# lint output is wasteful noise here.
-
-NO_LINT=
diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc
index 6ceebdef9d59..7f963b3788d1 100644
--- a/gnu/Makefile.inc
+++ b/gnu/Makefile.inc
@@ -1,4 +1 @@
-# Do not lint the GNU stuff. It is all externally maintained and
-# lint output is wasteful noise here.
-
-NO_LINT=
+# This file is empty to prevent infinite recursion in */Makefile.inc
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 71bd19c0b895..2525f3888806 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,7 +1,5 @@
.include <src.opts.mk>
-NO_LINT=
-
KRB5DIR= ${SRCTOP}/crypto/heimdal
CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 254f05a1e740..512a452ad6d0 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -8,8 +8,6 @@ SHLIBDIR?= /lib
LIB= ncursesw
SHLIB_MAJOR= 9
-NO_LINT=
-
GENSRCS= \
expanded.c \
lib_gen.c
diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile
index e11d0e15245e..920bd6e5559c 100644
--- a/lib/ncurses/tinfo/Makefile
+++ b/lib/ncurses/tinfo/Makefile
@@ -8,8 +8,6 @@ SHLIBDIR?= /lib
LIB= tinfow
SHLIB_MAJOR= 9
-NO_LINT=
-
NCURSES_MAJOR!= egrep 'NCURSES_MAJOR[ ]*=' ${NCURSES_DIR}/dist.mk |
sed -e 's%^[^0-9]*%%'
NCURSES_MINOR!= egrep 'NCURSES_MINOR[ ]*=' ${NCURSES_DIR}/dist.mk |
sed -e 's%^[^0-9]*%%'
NCURSES_PATCH!= egrep 'NCURSES_PATCH[ ]*=' ${NCURSES_DIR}/dist.mk |
sed -e 's%^[^0-9]*%%'
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index a6ca46ecd372..4d2ad2294829 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -11,7 +11,6 @@ LIB= crypto
SHLIB_MAJOR= 30
VERSION_MAP= ${.CURDIR}/Version.map
-NO_LINT=
PCFILES= libcrypto.pc
.include "Makefile.man"
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 35883d4a9d42..2f1bc4a9ba69 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -65,8 +65,6 @@ LIBADD+= ldns
CFLAGS+= -D_PATH_SSH_ASKPASS_DEFAULT='"${LOCALBASE}/bin/ssh-askpass"'
.endif
-NO_LINT=
-
LIBADD+= crypto crypt z
.include <bsd.lib.mk>
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index 9d8a64ee0ab4..d8ce01cdb92e 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -5,8 +5,6 @@ SHLIB_MAJOR= 30
VERSION_MAP= ${.CURDIR}/Version.map
PACKAGE= openssl-lib
-NO_LINT=
-
PCFILES= libssl.pc openssl.pc
.include "../libcrypto/Makefile.inc"
diff --git a/targets/pseudo/bootstrap-tools/Makefile
b/targets/pseudo/bootstrap-tools/Makefile
index d342af4ff9f9..77e656ca56c5 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -38,7 +38,6 @@ BSARGS= DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET} \
-DNO_CPU_CFLAGS \
- -DNO_LINT \
-DNO_PIC \
-DNO_SHARED \
MK_CTF=no \
