Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F98177538
D26455.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
12 KB
Referenced Files
None
Subscribers
None
D26455.diff
View Options
Index: head/Makefile.inc1
===================================================================
--- head/Makefile.inc1
+++ head/Makefile.inc1
@@ -2226,12 +2226,9 @@
_bootstrap_tools_links+=crunchide
.endif
-# r285986 crunchen: use STRIPBIN rather than STRIP
-# 1100113: Support MK_AUTO_OBJ
-# 1200006: META_MODE fixes
-.if ${BOOTSTRAPPING} < 1100078 || \
- (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) || \
- (${MK_META_MODE} == "yes" && ${BOOTSTRAPPING} < 1200006)
+# 1300115: Higher WARNS fixes
+.if ${BOOTSTRAPPING} < 1202502 || \
+ (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300115)
_crunchgen= usr.sbin/crunch/crunchgen
.else
_bootstrap_tools_links+=crunchgen
Index: head/bin/Makefile.inc
===================================================================
--- head/bin/Makefile.inc
+++ head/bin/Makefile.inc
@@ -4,7 +4,6 @@
.include <src.opts.mk>
BINDIR?= /bin
-WARNS?= 6
.if ${MK_DYNAMICROOT} == "no"
NO_SHARED?= YES
Index: head/gnu/lib/libregex/Makefile
===================================================================
--- head/gnu/lib/libregex/Makefile
+++ head/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: head/gnu/usr.bin/diff3/Makefile
===================================================================
--- head/gnu/usr.bin/diff3/Makefile
+++ head/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: head/gnu/usr.bin/gdb/Makefile.inc
===================================================================
--- head/gnu/usr.bin/gdb/Makefile.inc
+++ head/gnu/usr.bin/gdb/Makefile.inc
@@ -2,6 +2,8 @@
.include <src.opts.mk>
+WARNS?= 0
+
VERSION= "6.1.1 [FreeBSD]"
VENDOR= marcel
Index: head/gnu/usr.bin/grep/Makefile
===================================================================
--- head/gnu/usr.bin/grep/Makefile
+++ head/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: head/lib/Makefile.inc
===================================================================
--- head/lib/Makefile.inc
+++ head/lib/Makefile.inc
@@ -1,5 +1,3 @@
# $FreeBSD$
# Default version for system libs (override in <lib>/Makefile if necessary)
SHLIB_MAJOR?= 5
-
-WARNS?= 6
Index: head/lib/clang/Makefile.inc
===================================================================
--- head/lib/clang/Makefile.inc
+++ head/lib/clang/Makefile.inc
@@ -9,3 +9,5 @@
.else
DEBUG_FILES_CFLAGS= -g1
.endif
+
+WARNS?= 0
Index: head/lib/libarchive/tests/Makefile
===================================================================
--- head/lib/libarchive/tests/Makefile
+++ head/lib/libarchive/tests/Makefile
@@ -3,6 +3,8 @@
PACKAGE= tests
+WARNS?= 3
+
_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
ATF_TESTS_SH+= functional_test
Index: head/lib/libc/tests/regex/Makefile.inc
===================================================================
--- head/lib/libc/tests/regex/Makefile.inc
+++ head/lib/libc/tests/regex/Makefile.inc
@@ -3,6 +3,7 @@
.include <bsd.own.mk>
BINDIR?= ${TESTSDIR}
+WARNS?= 3
# SKIP_LEFTASSOC -> these testcases fail on FreeBSD.
IMPLEMENTATION?= -DREGEX_SPENCER -DSKIP_LEFTASSOC
Index: head/lib/libcasper/services/cap_dns/tests/Makefile
===================================================================
--- head/lib/libcasper/services/cap_dns/tests/Makefile
+++ head/lib/libcasper/services/cap_dns/tests/Makefile
@@ -11,6 +11,4 @@
.endif
LIBADD+= nv
-WARNS?= 3
-
.include <bsd.test.mk>
Index: head/lib/libcasper/services/cap_grp/tests/Makefile
===================================================================
--- head/lib/libcasper/services/cap_grp/tests/Makefile
+++ head/lib/libcasper/services/cap_grp/tests/Makefile
@@ -11,6 +11,4 @@
.endif
LIBADD+= nv
-WARNS?= 3
-
.include <bsd.test.mk>
Index: head/lib/libcasper/services/cap_pwd/tests/Makefile
===================================================================
--- head/lib/libcasper/services/cap_pwd/tests/Makefile
+++ head/lib/libcasper/services/cap_pwd/tests/Makefile
@@ -11,6 +11,4 @@
.endif
LIBADD+= nv
-WARNS?= 3
-
.include <bsd.test.mk>
Index: head/lib/libcasper/services/cap_sysctl/tests/Makefile
===================================================================
--- head/lib/libcasper/services/cap_sysctl/tests/Makefile
+++ head/lib/libcasper/services/cap_sysctl/tests/Makefile
@@ -11,8 +11,6 @@
.endif
LIBADD+= nv
-WARNS?= 3
-
TEST_METADATA.sysctl_test+= required_user="root"
.include <bsd.test.mk>
Index: head/lib/libthr/tests/Makefile
===================================================================
--- head/lib/libthr/tests/Makefile
+++ head/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: head/lib/libthr/tests/dlopen/Makefile
===================================================================
--- head/lib/libthr/tests/dlopen/Makefile
+++ head/lib/libthr/tests/dlopen/Makefile
@@ -2,6 +2,8 @@
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen
+WARNS?= 2
+
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libthr/dlopen
Index: head/lib/libthr/tests/dlopen/dso/Makefile
===================================================================
--- head/lib/libthr/tests/dlopen/dso/Makefile
+++ head/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: head/lib/libxo/tests/Makefile
===================================================================
--- head/lib/libxo/tests/Makefile
+++ head/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: head/lib/ofed/Makefile.inc
===================================================================
--- head/lib/ofed/Makefile.inc
+++ head/lib/ofed/Makefile.inc
@@ -1 +1,3 @@
# $FreeBSD$
+
+WARNS?= 0
Index: head/rescue/librescue/Makefile
===================================================================
--- head/rescue/librescue/Makefile
+++ head/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: head/sbin/Makefile.inc
===================================================================
--- head/sbin/Makefile.inc
+++ head/sbin/Makefile.inc
@@ -4,7 +4,6 @@
.include <src.opts.mk>
BINDIR?= /sbin
-WARNS?= 6
.if ${MK_DYNAMICROOT} == "no"
NO_SHARED?= YES
Index: head/secure/lib/libcrypto/engines/Makefile.inc
===================================================================
--- head/secure/lib/libcrypto/engines/Makefile.inc
+++ head/secure/lib/libcrypto/engines/Makefile.inc
@@ -18,3 +18,5 @@
CFLAGS+= -DNDEBUG
.PATH: ${LCRYPTO_SRC}/engines
+
+WARNS?= 0
Index: head/share/mk/bsd.sys.mk
===================================================================
--- head/share/mk/bsd.sys.mk
+++ head/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: head/share/mk/src.sys.mk
===================================================================
--- head/share/mk/src.sys.mk
+++ head/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: head/tests/sys/cddl/zfs/bin/Makefile
===================================================================
--- head/tests/sys/cddl/zfs/bin/Makefile
+++ head/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: head/tests/sys/cddl/zfs/tests/Makefile.inc
===================================================================
--- head/tests/sys/cddl/zfs/tests/Makefile.inc
+++ head/tests/sys/cddl/zfs/tests/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+WARNS?= 0
Index: head/tests/sys/geom/class/eli/Makefile
===================================================================
--- head/tests/sys/geom/class/eli/Makefile
+++ head/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: head/tests/sys/net/routing/Makefile
===================================================================
--- head/tests/sys/net/routing/Makefile
+++ head/tests/sys/net/routing/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PACKAGE= tests
+WARNS?= 1
TESTSDIR= ${TESTSBASE}/sys/net/routing
Index: head/tools/build/depend-cleanup.sh
===================================================================
--- head/tools/build/depend-cleanup.sh
+++ head/tools/build/depend-cleanup.sh
@@ -49,3 +49,10 @@
echo "Removing old ZFS tree"
rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl
fi
+
+# 20200916 WARNS bumped, need bootstrapped crunchgen stubs
+if [ -e "$OBJTOP"/rescue/rescue/rescue.c ] && \
+ ! grep -q 'crunched_stub_t' "$OBJTOP"/rescue/rescue/rescue.c; then
+ echo "Removing old rescue(8) tree"
+ rm -rf "$OBJTOP"/rescue/rescue
+fi
Index: head/usr.bin/Makefile.inc
===================================================================
--- head/usr.bin/Makefile.inc
+++ head/usr.bin/Makefile.inc
@@ -2,5 +2,3 @@
# $FreeBSD$
BINDIR?= /usr/bin
-
-WARNS?= 6
Index: head/usr.bin/ofed/infiniband-diags/Makefile.inc
===================================================================
--- head/usr.bin/ofed/infiniband-diags/Makefile.inc
+++ head/usr.bin/ofed/infiniband-diags/Makefile.inc
@@ -10,3 +10,4 @@
CFLAGS+= -I${_spath} -I${_spath}/src
LIBADD+= osmcomp ibmad ibumad
+WARNS?= 0
Index: head/usr.bin/ofed/libibverbs/Makefile.inc
===================================================================
--- head/usr.bin/ofed/libibverbs/Makefile.inc
+++ head/usr.bin/ofed/libibverbs/Makefile.inc
@@ -7,3 +7,4 @@
CFLAGS+= -I${_spath}
LIBADD+= ibverbs mlx4 mlx5 cxgb4 pthread
+WARNS?= 2
Index: head/usr.bin/ofed/librdmacm/Makefile.inc
===================================================================
--- head/usr.bin/ofed/librdmacm/Makefile.inc
+++ head/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: head/usr.bin/tar/tests/Makefile
===================================================================
--- head/usr.bin/tar/tests/Makefile
+++ head/usr.bin/tar/tests/Makefile
@@ -2,6 +2,8 @@
PACKAGE= tests
+WARNS?= 3
+
_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
ATF_TESTS_SH+= functional_test
Index: head/usr.sbin/Makefile.inc
===================================================================
--- head/usr.sbin/Makefile.inc
+++ head/usr.sbin/Makefile.inc
@@ -2,5 +2,3 @@
# $FreeBSD$
BINDIR?= /usr/sbin
-
-WARNS?= 6
Index: head/usr.sbin/wpa/Makefile.inc
===================================================================
--- head/usr.sbin/wpa/Makefile.inc
+++ head/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
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Oct 3, 2:24 PM (15 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13370091
Default Alt Text
D26455.diff (12 KB)
Attached To
Mode
D26455: Bootstrap crunchgen for builds from older trees
Attached
Detach File
Event Timeline
Log In to Comment