Module Name: src
Committed By: lukem
Date: Wed May 31 20:45:02 UTC 2023
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
bsd.own.mk: sort lists. whitespace fixes
Create _NOVARS for the list of NO* variables,
for consistency with _MKVARS.yes and _MKVARS.no
Format _NOVARS, _MKVARS.yes, and _MKVARS.no with
one entry per line, and sort the lists.
Simplifies review and adding new entries.
Per suggestion from riastradh@
Line up some variable assignments more consistently.
To generate a diff of this commit:
cvs rdiff -u -r1.1329 -r1.1330 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1329 src/share/mk/bsd.own.mk:1.1330
--- src/share/mk/bsd.own.mk:1.1329 Mon May 29 20:31:09 2023
+++ src/share/mk/bsd.own.mk Wed May 31 20:45:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1329 2023/05/29 20:31:09 lukem Exp $
+# $NetBSD: bsd.own.mk,v 1.1330 2023/05/31 20:45:02 lukem Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -532,11 +532,11 @@ TOOL_CXX.clang= clang++
TOOL_OBJC.clang= clang
# GCC supports C, C++, Fortran and Objective C
-TOOL_CC.gcc= gcc
-TOOL_CPP.gcc= cpp
-TOOL_CXX.gcc= c++
-TOOL_FC.gcc= gfortran
-TOOL_OBJC.gcc= gcc
+TOOL_CC.gcc= gcc
+TOOL_CPP.gcc= cpp
+TOOL_CXX.gcc= c++
+TOOL_FC.gcc= gfortran
+TOOL_OBJC.gcc= gcc
# PCC supports C and Fortran
TOOL_CC.pcc= pcc
@@ -614,7 +614,7 @@ TOOL_PIC= pic
TOOL_PIGZ= pigz
TOOL_XZ= xz
TOOL_PKG_CREATE= pkg_create
-TOOL_POWERPCMKBOOTIMAGE= powerpc-mkbootimage
+TOOL_POWERPCMKBOOTIMAGE=powerpc-mkbootimage
TOOL_PWD_MKDB= pwd_mkdb
TOOL_REFER= refer
TOOL_ROFF_ASCII= nroff
@@ -1029,11 +1029,27 @@ dependall: .NOTMAIN realdepend .MAKE
# Source makefiles should set NO*, and not MK*, and must do so before
# including bsd.own.mk.
#
-.for var in \
- NOCOMPAT NODEBUGLIB NODOC NOHTML NOINFO \
- NOLIBCSANITIZER NOLINKLIB NOLINT NOMAN NONLS NOOBJ \
- NOPIC NOPICINSTALL NOPROFILE NORELRO \
- NOSANITIZER NOSHARE NOSTATICLIB
+_NOVARS= \
+ NOCOMPAT \
+ NODEBUGLIB \
+ NODOC \
+ NOHTML \
+ NOINFO \
+ NOLIBCSANITIZER \
+ NOLINKLIB \
+ NOLINT \
+ NOMAN \
+ NONLS \
+ NOOBJ \
+ NOPIC \
+ NOPICINSTALL \
+ NOPROFILE \
+ NORELRO \
+ NOSANITIZER \
+ NOSHARE \
+ NOSTATICLIB
+
+.for var in ${_NOVARS}
.if defined(${var})
MK${var:S/^NO//}:= no
.endif
@@ -1166,28 +1182,50 @@ _MKVARS.yes= \
MKATF \
MKBINUTILS \
MKBSDTAR \
- MKCOMPLEX MKCVS MKCXX \
- MKDOC MKDTC \
+ MKCOMPLEX \
+ MKCVS \
+ MKCXX \
+ MKDOC \
+ MKDTC \
MKDYNAMICROOT \
- MKGCC MKGDB MKGROFF \
- MKHESIOD MKHTML \
- MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
+ MKGCC \
+ MKGDB \
+ MKGROFF \
+ MKHESIOD \
+ MKHTML \
+ MKIEEEFP \
+ MKINET6 \
+ MKINFO \
+ MKIPFILTER \
+ MKISCSI \
MKKERBEROS \
MKKMOD \
- MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \
- MKMAN MKMANDOC \
- MKMDNS \
+ MKLDAP \
+ MKLIBSTDCXX \
+ MKLINKLIB \
+ MKLVM \
MKMAKEMANDB \
+ MKMAN \
+ MKMANDOC \
+ MKMDNS \
MKNLS \
MKNPF \
MKOBJ \
- MKPAM MKPERFUSE \
- MKPF MKPIC MKPICLIB MKPOSTFIX MKPROFILE \
+ MKPAM \
+ MKPERFUSE \
+ MKPF \
+ MKPIC \
+ MKPICLIB \
+ MKPOSTFIX \
+ MKPROFILE \
MKRUMP \
- MKSHARE MKSKEY MKSTATICLIB \
+ MKSHARE \
+ MKSKEY \
+ MKSTATICLIB \
MKUNBOUND \
MKX11FONTS \
MKYP
+
.for var in ${_MKVARS.yes}
${var}?= ${${var}.${MACHINE_ARCH}:Uyes}
.endfor
@@ -1315,22 +1353,45 @@ _MKVARS.no= \
MKAMDGPUFIRMWARE \
MKARZERO \
MKBSDGREP \
- MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCTF \
- MKDEBUG MKDEBUGLIB MKDTB MKDTRACE \
+ MKCATPAGES \
+ MKCOMPATTESTS \
+ MKCOMPATX11 \
+ MKCTF \
+ MKDEBUG \
+ MKDEBUGLIB \
+ MKDTB \
+ MKDTRACE \
MKFIRMWARE \
MKGROFFHTMLDOC \
MKKYUA \
- MKLIBCXX MKLLD MKLLDB MKLLVM MKLLVMRT MKLINT \
- MKMANZ MKMCLINKER \
- MKNOUVEAUFIRMWARE MKNSD \
+ MKLIBCXX \
+ MKLINT \
+ MKLLD \
+ MKLLDB \
+ MKLLVM \
+ MKLLVMRT \
+ MKMANZ \
+ MKMCLINKER \
+ MKNOUVEAUFIRMWARE \
+ MKNSD \
MKOBJDIRS \
- MKPCC MKPICINSTALL MKPIGZGZIP \
- MKRADEONFIRMWARE MKREPRO \
- MKSLJIT MKSOFTFLOAT MKSTRIPIDENT \
- MKTEGRAFIRMWARE MKTPM \
- MKUNPRIVED MKUPDATE \
- MKX11 MKX11MOTIF MKXORG_SERVER \
+ MKPCC \
+ MKPICINSTALL \
+ MKPIGZGZIP \
+ MKRADEONFIRMWARE \
+ MKREPRO \
+ MKSLJIT \
+ MKSOFTFLOAT \
+ MKSTRIPIDENT \
+ MKTEGRAFIRMWARE \
+ MKTPM \
+ MKUNPRIVED \
+ MKUPDATE \
+ MKX11 \
+ MKX11MOTIF \
+ MKXORG_SERVER \
MKZFS
+
.for var in ${_MKVARS.no}
${var}?= ${${var}.${MACHINE_ARCH}:U${${var}.${MACHINE}:Uno}}
.endfor
