summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 08:52:53 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 08:52:53 +0000
commitabaa8cb87058c08ad0688c849a28f4e007c07bbb (patch)
treeb605286f3fba170e6cbf35b5f30a1a915e19d120 /usr.sbin
parent4e669cc7c9ec3b3364a9f7d56e92bdf770cca438 (diff)
bsd.own.mk: rename to CC_WNO_ADDRESS_OF_PACKED_MEMBER
Provide a single variable CC_WNO_ADDRESS_OF_PACKED_MEMBER with options for both clang and gcc, to replace CLANG_NO_ADDR_OF_PACKED_MEMBER CC_NO_ADDR_OF_PACKED_MEMBER GCC_NO_ADDR_OF_PACKED_MEMBER Using the convention CC_compilerflag, where compilerflag is based on the full compiler flag name.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bootp/common/Makefile4
-rw-r--r--usr.sbin/fstyp/Makefile4
-rw-r--r--usr.sbin/installboot/Makefile4
-rw-r--r--usr.sbin/makefs/udf/Makefile.inc4
-rw-r--r--usr.sbin/map-mbone/Makefile4
-rw-r--r--usr.sbin/mrinfo/Makefile4
-rw-r--r--usr.sbin/mrouted/Makefile4
-rw-r--r--usr.sbin/mtrace/Makefile4
-rw-r--r--usr.sbin/ndbootd/Makefile4
-rw-r--r--usr.sbin/pf/Makefile.inc4
-rw-r--r--usr.sbin/racoon/Makefile4
11 files changed, 22 insertions, 22 deletions
diff --git a/usr.sbin/bootp/common/Makefile b/usr.sbin/bootp/common/Makefile
index a44f39836b3..9b12e6a8406 100644
--- a/usr.sbin/bootp/common/Makefile
+++ b/usr.sbin/bootp/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/05/30 02:28:35 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 08:53:00 lukem Exp $
LIBISPRIVATE= yes
@@ -7,6 +7,6 @@ SRCS= dovend.c dumptab.c getif.c hash.c hwaddr.c lookup.c readfile.c \
report.c tzone.c
CPPFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.lib.mk>
diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
index 27482d2ee47..9adb10b00fc 100644
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/09/17 14:48:31 christos Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 08:53:00 lukem Exp $
.include <bsd.own.mk>
@@ -32,6 +32,6 @@ CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libnvpair
.endif
CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile
index fc6a5dcfa45..da996811b0a 100644
--- a/usr.sbin/installboot/Makefile
+++ b/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2020/09/06 07:20:31 mrg Exp $
+# $NetBSD: Makefile,v 1.57 2023/06/03 08:53:00 lukem Exp $
#
.include <bsd.own.mk>
@@ -88,6 +88,6 @@ DPADD+= ${LIBUTIL}
.endif
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/usr.sbin/makefs/udf/Makefile.inc b/usr.sbin/makefs/udf/Makefile.inc
index ca726869190..ac0dd263029 100644
--- a/usr.sbin/makefs/udf/Makefile.inc
+++ b/usr.sbin/makefs/udf/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2022/04/10 09:22:35 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.7 2023/06/03 08:53:00 lukem Exp $
#
UDF= ${NETBSDSRCDIR}/sys/fs/udf
@@ -17,4 +17,4 @@ LDADD+=-lutil -lprop
.endif
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member -Wno-error=constant-conversion
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
diff --git a/usr.sbin/map-mbone/Makefile b/usr.sbin/map-mbone/Makefile
index 9bfbd15c6da..3136c552c38 100644
--- a/usr.sbin/map-mbone/Makefile
+++ b/usr.sbin/map-mbone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/09/06 07:20:31 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2023/06/03 08:53:00 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -12,6 +12,6 @@ PROG= map-mbone
SRCS= igmp.c inet.c kern.c mapper.c
MAN= map-mbone.8
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/usr.sbin/mrinfo/Makefile b/usr.sbin/mrinfo/Makefile
index caff306a8ef..5e9b5c5f3c2 100644
--- a/usr.sbin/mrinfo/Makefile
+++ b/usr.sbin/mrinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2023/06/03 08:53:00 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -14,6 +14,6 @@ MAN= mrinfo.8
BINOWN= root
BINMODE=4555
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 8a37ecf834d..5b9276730f9 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/usr.sbin/mrouted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2023/06/03 08:53:00 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ DPADD+= ${LIBUTIL}
CPPFLAGS+= -I${.CURDIR}
CWARNFLAGS.clang+= -Wno-format-extra-args
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS.cfparse.c+= ${GCC_NO_STRINGOP_TRUNCATION}
COPTS.vif.c+= ${GCC_NO_STRINGOP_TRUNCATION}
diff --git a/usr.sbin/mtrace/Makefile b/usr.sbin/mtrace/Makefile
index 13d726d122a..aef09db6198 100644
--- a/usr.sbin/mtrace/Makefile
+++ b/usr.sbin/mtrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 08:53:00 lukem Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -19,6 +19,6 @@ COPTS.mtrace.c=-O0
BINMODE=4555
BINOWN= root
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.prog.mk>
diff --git a/usr.sbin/ndbootd/Makefile b/usr.sbin/ndbootd/Makefile
index e25aba92e27..8d34e3cc54c 100644
--- a/usr.sbin/ndbootd/Makefile
+++ b/usr.sbin/ndbootd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 08:53:01 lukem Exp $
WARNS?= 1 # XXX -Wsign-compare -Wshadow
@@ -15,7 +15,7 @@ COPTS.ndbootd.c+= -fno-tree-ter -fno-tree-lrs
.endif
CWARNFLAGS.clang+= -Wno-tautological-compare
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.include <bsd.own.mk>
.include <bsd.prog.mk>
diff --git a/usr.sbin/pf/Makefile.inc b/usr.sbin/pf/Makefile.inc
index 03672330d1e..b3d14a4ee46 100644
--- a/usr.sbin/pf/Makefile.inc
+++ b/usr.sbin/pf/Makefile.inc
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.11 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.12 2023/06/03 08:53:01 lukem Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
CWARNFLAGS.clang+= -Wno-tautological-compare
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
CPPFLAGS+= -D_OPENBSD_SOURCE
diff --git a/usr.sbin/racoon/Makefile b/usr.sbin/racoon/Makefile
index 84e51fccc5f..39841926c84 100644
--- a/usr.sbin/racoon/Makefile
+++ b/usr.sbin/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2023/05/09 20:11:54 christos Exp $
+# $NetBSD: Makefile,v 1.43 2023/06/03 08:53:01 lukem Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -81,7 +81,7 @@ prsa_tok.c: ${DIST}/src/racoon/prsa_tok.l
prsa_par.c: ${DIST}/src/racoon/prsa_par.y
${YACC} -pprsa -d -o ${.TARGET} ${.ALLSRC}
-CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
COPTS+= -fcommon
COPTS.crypto_openssl.c+= -Wno-error=deprecated-declarations