Index: bin/Makefile.inc =================================================================== --- bin/Makefile.inc +++ bin/Makefile.inc @@ -4,7 +4,6 @@ .include BINDIR?= /bin -WARNS?= 6 .if ${MK_DYNAMICROOT} == "no" NO_SHARED?= YES Index: gnu/lib/libregex/Makefile =================================================================== --- gnu/lib/libregex/Makefile +++ gnu/lib/libregex/Makefile @@ -6,6 +6,8 @@ REGEXDIR= ${SRCTOP}/contrib/libgnuregex .PATH: ${REGEXDIR} +WARNS?= 1 + SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS INCS= regex.h.patched Index: gnu/usr.bin/diff3/Makefile =================================================================== --- gnu/usr.bin/diff3/Makefile +++ gnu/usr.bin/diff3/Makefile @@ -18,6 +18,8 @@ CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\" +WARNS?= 0 + .for f in diff3.c ${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} Index: gnu/usr.bin/gdb/Makefile.inc =================================================================== --- gnu/usr.bin/gdb/Makefile.inc +++ gnu/usr.bin/gdb/Makefile.inc @@ -2,6 +2,8 @@ .include +WARNS?= 0 + VERSION= "6.1.1 [FreeBSD]" VENDOR= marcel Index: gnu/usr.bin/grep/Makefile =================================================================== --- gnu/usr.bin/grep/Makefile +++ gnu/usr.bin/grep/Makefile @@ -14,6 +14,8 @@ xstrtoumax.c CLEANFILES+= gnugrep.1 +WARNS?= 0 + CFLAGS+=-I${.CURDIR} -I${SYSROOT:U${DESTDIR}}/usr/include/gnu -DHAVE_CONFIG_H .if ${MK_BSD_GREP} != "yes" Index: lib/Makefile.inc =================================================================== --- lib/Makefile.inc +++ lib/Makefile.inc @@ -1,5 +1,3 @@ # $FreeBSD$ # Default version for system libs (override in /Makefile if necessary) SHLIB_MAJOR?= 5 - -WARNS?= 6 Index: lib/clang/Makefile.inc =================================================================== --- lib/clang/Makefile.inc +++ lib/clang/Makefile.inc @@ -9,3 +9,5 @@ .else DEBUG_FILES_CFLAGS= -g1 .endif + +WARNS?= 0 Index: lib/libarchive/tests/Makefile =================================================================== --- lib/libarchive/tests/Makefile +++ lib/libarchive/tests/Makefile @@ -2,6 +2,8 @@ PACKAGE= tests +WARNS?= 3 + _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test Index: lib/libc/tests/regex/Makefile.inc =================================================================== --- lib/libc/tests/regex/Makefile.inc +++ lib/libc/tests/regex/Makefile.inc @@ -3,6 +3,7 @@ .include BINDIR?= ${TESTSDIR} +WARNS?= 3 # SKIP_LEFTASSOC -> these testcases fail on FreeBSD. IMPLEMENTATION?= -DREGEX_SPENCER -DSKIP_LEFTASSOC Index: lib/libcasper/services/cap_dns/tests/Makefile =================================================================== --- lib/libcasper/services/cap_dns/tests/Makefile +++ lib/libcasper/services/cap_dns/tests/Makefile @@ -11,6 +11,4 @@ .endif LIBADD+= nv -WARNS?= 3 - .include Index: lib/libcasper/services/cap_grp/tests/Makefile =================================================================== --- lib/libcasper/services/cap_grp/tests/Makefile +++ lib/libcasper/services/cap_grp/tests/Makefile @@ -11,6 +11,4 @@ .endif LIBADD+= nv -WARNS?= 3 - .include Index: lib/libcasper/services/cap_pwd/tests/Makefile =================================================================== --- lib/libcasper/services/cap_pwd/tests/Makefile +++ lib/libcasper/services/cap_pwd/tests/Makefile @@ -11,6 +11,4 @@ .endif LIBADD+= nv -WARNS?= 3 - .include Index: lib/libcasper/services/cap_sysctl/tests/Makefile =================================================================== --- lib/libcasper/services/cap_sysctl/tests/Makefile +++ lib/libcasper/services/cap_sysctl/tests/Makefile @@ -11,8 +11,6 @@ .endif LIBADD+= nv -WARNS?= 3 - TEST_METADATA.sysctl_test+= required_user="root" .include Index: lib/libthr/tests/Makefile =================================================================== --- lib/libthr/tests/Makefile +++ lib/libthr/tests/Makefile @@ -2,6 +2,8 @@ PACKAGE= tests +WARNS?= 3 + TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread # TODO: t_name (missing pthread_getname_np support in FreeBSD) Index: lib/libthr/tests/dlopen/Makefile =================================================================== --- lib/libthr/tests/dlopen/Makefile +++ lib/libthr/tests/dlopen/Makefile @@ -2,6 +2,8 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen +WARNS?= 2 + .include TESTSDIR= ${TESTSBASE}/lib/libthr/dlopen Index: lib/libthr/tests/dlopen/dso/Makefile =================================================================== --- lib/libthr/tests/dlopen/dso/Makefile +++ lib/libthr/tests/dlopen/dso/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso +WARNS?= 3 SHLIB= h_pthread_dlopen SHLIB_MAJOR= 1 Index: lib/libxo/tests/Makefile =================================================================== --- lib/libxo/tests/Makefile +++ lib/libxo/tests/Makefile @@ -4,6 +4,8 @@ PACKAGE= tests +WARNS?= 1 + LIBXOSRC= ${SRCTOP}/contrib/libxo # Override the default suffix transformation rules for .c/.o -> .out Index: lib/ofed/Makefile.inc =================================================================== --- lib/ofed/Makefile.inc +++ lib/ofed/Makefile.inc @@ -1 +1,3 @@ # $FreeBSD$ + +WARNS?= 0 Index: rescue/librescue/Makefile =================================================================== --- rescue/librescue/Makefile +++ rescue/librescue/Makefile @@ -23,6 +23,8 @@ SRCS= exec.c getusershell.c login_class.c popen.c rcmdsh.c \ sysctl.c system.c +WARNS?= 3 + CFLAGS+= -DRESCUE # Flags copied from src/lib/libc and src/lib/libutil # libc/db/Makefile.inc Index: sbin/Makefile.inc =================================================================== --- sbin/Makefile.inc +++ sbin/Makefile.inc @@ -4,7 +4,6 @@ .include BINDIR?= /sbin -WARNS?= 6 .if ${MK_DYNAMICROOT} == "no" NO_SHARED?= YES Index: secure/lib/libcrypto/engines/Makefile.inc =================================================================== --- secure/lib/libcrypto/engines/Makefile.inc +++ secure/lib/libcrypto/engines/Makefile.inc @@ -18,3 +18,5 @@ CFLAGS+= -DNDEBUG .PATH: ${LCRYPTO_SRC}/engines + +WARNS?= 0 Index: share/mk/bsd.sys.mk =================================================================== --- share/mk/bsd.sys.mk +++ share/mk/bsd.sys.mk @@ -28,6 +28,14 @@ CXXFLAGS+= -std=${CXXSTD} .endif +# This gives the Makefile we're evaluating at the top-level a chance to set +# WARNS. If it doesn't do so, we may freely pull a DEFAULTWARNS if it's set +# and use that. This allows us to default WARNS to 6 for src builds without +# needing to set the default in various Makefile.inc. +.if !defined(WARNS) && defined(DEFAULTWARNS) +WARNS= ${DEFAULTWARNS} +.endif + # -pedantic is problematic because it also imposes namespace restrictions #CFLAGS+= -pedantic .if defined(WARNS) Index: share/mk/src.sys.mk =================================================================== --- share/mk/src.sys.mk +++ share/mk/src.sys.mk @@ -40,6 +40,8 @@ CFCOMMONFLAG?= -fno-common CFLAGS+= ${CFCOMMONFLAG} +DEFAULTWARNS= 6 + # tempting, but bsd.compiler.mk causes problems this early # probably need to remove dependence on bsd.own.mk #.include "src.opts.mk" Index: tests/sys/cddl/zfs/bin/Makefile =================================================================== --- tests/sys/cddl/zfs/bin/Makefile +++ tests/sys/cddl/zfs/bin/Makefile @@ -7,6 +7,8 @@ BINDIR= ${TESTSBASE}/sys/cddl/zfs/bin SCRIPTSDIR= ${TESTSBASE}/sys/cddl/zfs/bin +WARNS?= 0 + SCRIPTS+= bsddisks.ksh SCRIPTS+= dircmp.ksh SCRIPTS+= dumpadm.ksh Index: tests/sys/cddl/zfs/tests/Makefile.inc =================================================================== --- /dev/null +++ tests/sys/cddl/zfs/tests/Makefile.inc @@ -0,0 +1,3 @@ +# $FreeBSD$ + +WARNS?= 0 Index: tests/sys/geom/class/eli/Makefile =================================================================== --- tests/sys/geom/class/eli/Makefile +++ tests/sys/geom/class/eli/Makefile @@ -4,6 +4,8 @@ PACKAGE= tests +WARNS?= 3 + TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} ATF_TESTS_C= pbkdf2_test Index: tests/sys/net/routing/Makefile =================================================================== --- tests/sys/net/routing/Makefile +++ tests/sys/net/routing/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PACKAGE= tests +WARNS?= 1 TESTSDIR= ${TESTSBASE}/sys/net/routing Index: usr.bin/Makefile.inc =================================================================== --- usr.bin/Makefile.inc +++ usr.bin/Makefile.inc @@ -2,5 +2,3 @@ # $FreeBSD$ BINDIR?= /usr/bin - -WARNS?= 6 Index: usr.bin/ofed/infiniband-diags/Makefile.inc =================================================================== --- usr.bin/ofed/infiniband-diags/Makefile.inc +++ usr.bin/ofed/infiniband-diags/Makefile.inc @@ -10,3 +10,4 @@ CFLAGS+= -I${_spath} -I${_spath}/src LIBADD+= osmcomp ibmad ibumad +WARNS?= 0 Index: usr.bin/ofed/libibverbs/Makefile.inc =================================================================== --- usr.bin/ofed/libibverbs/Makefile.inc +++ usr.bin/ofed/libibverbs/Makefile.inc @@ -7,3 +7,4 @@ CFLAGS+= -I${_spath} LIBADD+= ibverbs mlx4 mlx5 cxgb4 pthread +WARNS?= 2 Index: usr.bin/ofed/librdmacm/Makefile.inc =================================================================== --- usr.bin/ofed/librdmacm/Makefile.inc +++ usr.bin/ofed/librdmacm/Makefile.inc @@ -6,3 +6,5 @@ BINDIR?= /usr/bin CFLAGS+= -I${SRCTOP}/contrib/ofed LIBADD+= ibverbs rdmacm mlx4 mlx5 cxgb4 pthread + +WARNS?= 0 Index: usr.bin/tar/tests/Makefile =================================================================== --- usr.bin/tar/tests/Makefile +++ usr.bin/tar/tests/Makefile @@ -2,6 +2,8 @@ PACKAGE= tests +WARNS?= 3 + _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test Index: usr.sbin/Makefile.inc =================================================================== --- usr.sbin/Makefile.inc +++ usr.sbin/Makefile.inc @@ -2,5 +2,3 @@ # $FreeBSD$ BINDIR?= /usr/sbin - -WARNS?= 6 Index: usr.sbin/wpa/Makefile.inc =================================================================== --- usr.sbin/wpa/Makefile.inc +++ usr.sbin/wpa/Makefile.inc @@ -2,6 +2,8 @@ BINDIR?= /usr/sbin +WARNS?= 0 + WPA_DISTDIR?= ${SRCTOP}/contrib/wpa/ WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd