Module Name: src
Committed By: mrg
Date: Mon Apr 12 02:54:09 UTC 2021
Modified Files:
src/external/bsd/flex/bin: Makefile
src/external/bsd/ipf/bin/ipfstat: Makefile
src/external/bsd/tcpdump/bin: Makefile
src/external/gpl2/lvm2/lib/libdevmapper: Makefile
src/external/gpl2/lvm2/lib/liblvm: Makefile
src/external/mit/lua/lib/liblua: Makefile
src/external/public-domain/xz/bin/xz: Makefile
src/games/hunt/huntd: Makefile
src/sys/modules/lua: Makefile
src/tests/sys/netatalk: Makefile
src/usr.sbin/pf/pfctl: Makefile
Log Message:
add some new uses of existing GCC_NO_* variables for warning issues.
remove an no longer relevant for gcc7 workaround (works fine in both
gcc9 and gcc 10.)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/flex/bin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ipf/bin/ipfstat/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/lvm2/lib/libdevmapper/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/lvm2/lib/liblvm/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/lib/liblua/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/public-domain/xz/bin/xz/Makefile
cvs rdiff -u -r1.8 -r1.9 src/games/hunt/huntd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/modules/lua/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/netatalk/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/pf/pfctl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.15 src/external/bsd/flex/bin/Makefile:1.16
--- src/external/bsd/flex/bin/Makefile:1.15 Sun Oct 13 07:28:06 2019
+++ src/external/bsd/flex/bin/Makefile Mon Apr 12 02:54:07 2021
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:06 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2021/04/12 02:54:07 mrg Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -80,5 +80,6 @@ COPTS.scan.c+= -O1
COPTS.filter.c+= ${GCC_NO_FORMAT_TRUNCATION}
COPTS.misc.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.parse.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/external/bsd/ipf/bin/ipfstat/Makefile
diff -u src/external/bsd/ipf/bin/ipfstat/Makefile:1.1 src/external/bsd/ipf/bin/ipfstat/Makefile:1.2
--- src/external/bsd/ipf/bin/ipfstat/Makefile:1.1 Fri Mar 23 21:29:45 2012
+++ src/external/bsd/ipf/bin/ipfstat/Makefile Mon Apr 12 02:54:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/23 21:29:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2021/04/12 02:54:07 mrg Exp $
PROG= ipfstat
SRCS= ipfstat.c
@@ -6,4 +6,6 @@ MAN= ipfstat.8
DPADD+= ${LIBCURSES} ${LIBTERMINFO}
LDADD+= -lcurses -lterminfo
+COPTS.ipfstat.c+= ${GCC_NO_FORMAT_OVERFLOW}
+
.include <bsd.prog.mk>
Index: src/external/bsd/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.20 src/external/bsd/tcpdump/bin/Makefile:1.21
--- src/external/bsd/tcpdump/bin/Makefile:1.20 Sun Sep 6 07:20:26 2020
+++ src/external/bsd/tcpdump/bin/Makefile Mon Apr 12 02:54:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/09/06 07:20:26 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2021/04/12 02:54:07 mrg Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -207,5 +207,6 @@ tcpdump.8: tcpdump.1.in
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+COPTS.print-bgp.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/external/gpl2/lvm2/lib/libdevmapper/Makefile
diff -u src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.10 src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.11
--- src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.10 Tue Oct 4 14:33:16 2016
+++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile Mon Apr 12 02:54:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/10/04 14:33:16 christos Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/12 02:54:08 mrg Exp $
USE_SHLIBDIR= yes
USE_FORT?= no
@@ -46,4 +46,7 @@ COPTS.libdm-nbsd-iface.c+= -O0
.PATH: ${LIBDEVMAPPER_DISTDIR}/regex
.PATH: ${LIBDEVMAPPER_DISTDIR}/ioctl
+COPTS.libdm-common.c += ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.fs.c += ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.lib.mk>
Index: src/external/gpl2/lvm2/lib/liblvm/Makefile
diff -u src/external/gpl2/lvm2/lib/liblvm/Makefile:1.8 src/external/gpl2/lvm2/lib/liblvm/Makefile:1.9
--- src/external/gpl2/lvm2/lib/liblvm/Makefile:1.8 Tue Jan 5 13:07:46 2016
+++ src/external/gpl2/lvm2/lib/liblvm/Makefile Mon Apr 12 02:54:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/05 13:07:46 christos Exp $
+# $NetBSD: Makefile,v 1.9 2021/04/12 02:54:08 mrg Exp $
LIBISPRIVATE= yes
@@ -9,13 +9,13 @@ NOLINT= #defined
LIB= lvm
+.include <bsd.own.mk>
+
CWARNFLAGS+= -Wno-parentheses
CPPFLAGS+= -I${LVM2_DISTDIR}/lib -I${LVM2_DISTDIR}/include \
-I.
-.include <bsd.own.mk>
-
# Some parts of liblvm can't be protected because if its
# alloca() usage.
#
@@ -24,6 +24,7 @@ CPPFLAGS+= -Wno-stack-protector
.endif
CPPFLAGS.imLcLkup.c=-Wno-error
+COPTS.fs.c+= ${GCC_NO_STRINGOP_OVERFLOW}
SRCS+= activate.c lvmcache.c toolcontext.c config.c btree.c \
str_list.c dev-cache.c dev-io.c dev-md.c device.c dev-swap.c \
Index: src/external/mit/lua/lib/liblua/Makefile
diff -u src/external/mit/lua/lib/liblua/Makefile:1.9 src/external/mit/lua/lib/liblua/Makefile:1.10
--- src/external/mit/lua/lib/liblua/Makefile:1.9 Mon Nov 11 22:45:26 2019
+++ src/external/mit/lua/lib/liblua/Makefile Mon Apr 12 02:54:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/11/11 22:45:26 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2021/04/12 02:54:08 mrg Exp $
LIB= lua
LUA_CORE= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c \
@@ -16,6 +16,7 @@ INCSDIR= /usr/include
CPPFLAGS+= -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_C89_NUMBERS
CWARNFLAGS.clang+= -Wno-empty-body -Wno-error=string-plus-int
+COPTS.lstring.c+= ${GCC_NO_STRINGOP_OVERFLOW}
LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm
Index: src/external/public-domain/xz/bin/xz/Makefile
diff -u src/external/public-domain/xz/bin/xz/Makefile:1.5 src/external/public-domain/xz/bin/xz/Makefile:1.6
--- src/external/public-domain/xz/bin/xz/Makefile:1.5 Tue Sep 25 12:34:42 2018
+++ src/external/public-domain/xz/bin/xz/Makefile Mon Apr 12 02:54:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/09/25 12:34:42 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/12 02:54:08 mrg Exp $
PROG= xz
BINDIR= /usr/bin
@@ -51,3 +51,5 @@ DPADD+= ${LIBLZMA} ${LIBINTL} ${LIBPTHRE
LDADD+= -llzma -lintl -lpthread
.include <bsd.prog.mk>
.endif
+
+COPTS.message.c += ${GCC_NO_FORMAT_TRUNCATION}
Index: src/games/hunt/huntd/Makefile
diff -u src/games/hunt/huntd/Makefile:1.8 src/games/hunt/huntd/Makefile:1.9
--- src/games/hunt/huntd/Makefile:1.8 Sun Sep 29 23:44:59 2019
+++ src/games/hunt/huntd/Makefile Mon Apr 12 02:54:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/09/29 23:44:59 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2021/04/12 02:54:08 mrg Exp $
PROG= huntd
SRCS= answer.c draw.c driver.c execute.c expl.c \
@@ -9,9 +9,8 @@ CPPFLAGS+=-I${.CURDIR}/../include
.include <bsd.own.mk>
-# Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.shots.c+= -Wno-error=implicit-fallthrough
-.endif
+# Appears wrong - should not exceed bounds of array.
+COPTS.answer.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.shots.c+= ${GCC_NO_STRINGOP_OVERFLOW}
.include <bsd.prog.mk>
Index: src/sys/modules/lua/Makefile
diff -u src/sys/modules/lua/Makefile:1.11 src/sys/modules/lua/Makefile:1.12
--- src/sys/modules/lua/Makefile:1.11 Mon Nov 11 22:45:27 2019
+++ src/sys/modules/lua/Makefile Mon Apr 12 02:54:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/11/11 22:45:27 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2021/04/12 02:54:08 mrg Exp $
.include "../Makefile.inc"
@@ -24,4 +24,6 @@ CPPFLAGS+= -I${S}/../external/mit/lua/di
CWARNFLAGS.clang+= -Wno-error=string-plus-int
+COPTS.lstring.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.kmodule.mk>
Index: src/tests/sys/netatalk/Makefile
diff -u src/tests/sys/netatalk/Makefile:1.1 src/tests/sys/netatalk/Makefile:1.2
--- src/tests/sys/netatalk/Makefile:1.1 Tue Dec 2 19:48:21 2014
+++ src/tests/sys/netatalk/Makefile Mon Apr 12 02:54:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/12/02 19:48:21 christos Exp $
+# $NetBSD: Makefile,v 1.2 2021/04/12 02:54:08 mrg Exp $
#
WARNS?=6
@@ -9,4 +9,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/sys -D_TEST
TESTS_C= t_print
+COPTS.t_print.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.test.mk>
Index: src/usr.sbin/pf/pfctl/Makefile
diff -u src/usr.sbin/pf/pfctl/Makefile:1.4 src/usr.sbin/pf/pfctl/Makefile:1.5
--- src/usr.sbin/pf/pfctl/Makefile:1.4 Wed Jun 18 09:06:28 2008
+++ src/usr.sbin/pf/pfctl/Makefile Mon Apr 12 02:54:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/18 09:06:28 yamt Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/12 02:54:08 mrg Exp $
# $OpenBSD: Makefile,v 1.17 2004/07/16 23:44:24 frantzen Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
@@ -25,4 +25,6 @@ LDSTATIC?= -static
.include <bsd.prog.mk>
+COPTS.pfctl_osfp.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.PATH: ${NETBSDSRCDIR}/dist/pf/sbin/pfctl
