From 6dd738473955429dcfc85a5829c422837216bb26 Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Mon, 3 Nov 2008 00:25:45 +0000 Subject: [PATCH] Bring in some changes to bsd.sys.mk from FreeBSD. -Werror is turned on for i386/gcc41 builds (can be overridden with NO_WERROR. -Use CWARNFLAGS so they can be overridden easily. -Introduce CSTD which allows a Makefile to specify the precise dialect of C. Reviewed-by: swildner --- bin/ed/Makefile | 3 +- etc/defaults/make.conf | 5 +-- gnu/usr.bin/binutils217/Makefile.inc0 | 3 +- lib/libm/Makefile | 4 +- lib/libutil/Makefile | 4 +- sbin/ccdconfig/Makefile | 3 +- sbin/dhclient/Makefile | 4 +- sbin/disklabel64/crc32.c | 5 ++- sbin/ipfw/Makefile | 4 +- sbin/md5/Makefile | 4 +- sbin/route/Makefile | 3 +- sbin/routed/rtquery/Makefile | 3 +- secure/lib/libtelnet/Makefile | 4 +- secure/libexec/telnetd/Makefile | 4 +- secure/usr.bin/telnet/Makefile | 4 +- share/man/man5/make.conf.5 | 8 +--- share/mk/bsd.sys.mk | 55 ++++++++++++++++----------- sys/libkern/crc32.c | 3 +- usr.bin/find/Makefile | 3 +- usr.bin/fstat/Makefile | 3 +- usr.bin/make/Makefile | 3 +- usr.bin/mkstr/Makefile | 3 +- usr.bin/truncate/Makefile | 3 +- usr.sbin/keyserv/Makefile | 4 +- usr.sbin/pciconf/Makefile | 4 +- usr.sbin/pfctl/pfctl_altq.c | 4 +- usr.sbin/pflogd/Makefile | 4 +- usr.sbin/pstat/Makefile | 4 +- 28 files changed, 85 insertions(+), 73 deletions(-) diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 61859c7228..bb997aa084 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,11 +1,12 @@ # $FreeBSD: src/bin/ed/Makefile,v 1.18.2.1 2001/12/13 09:58:12 ru Exp $ -# $DragonFly: src/bin/ed/Makefile,v 1.9 2007/04/06 21:33:28 pavalos Exp $ +# $DragonFly: src/bin/ed/Makefile,v 1.10 2008/11/03 00:25:44 pavalos Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 +WARNS?= 2 .if exists(${.CURDIR}/../../secure) && !defined(NO_CRYPT) DISTRIBUTION=crypto diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index f75ba20cd1..c2ba27b416 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $ -# $DragonFly: src/etc/defaults/make.conf,v 1.37 2008/07/26 16:25:30 pavalos Exp $ +# $DragonFly: src/etc/defaults/make.conf,v 1.38 2008/11/03 00:25:44 pavalos Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -69,9 +69,6 @@ BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ -Wmissing-prototypes -Wnested-externs -Wpointer-arith \ -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings # -# WARNS_WERROR causes -Werror to be added when WARNS is in effect. -#WARNS_WERROR= yes -# # To compile just the kernel with special optimizations, you should use # this instead of CFLAGS (which is not applicable to kernel builds anyway). # There is very little to gain by using higher optimization levels, and doing diff --git a/gnu/usr.bin/binutils217/Makefile.inc0 b/gnu/usr.bin/binutils217/Makefile.inc0 index 7ef8753e9d..9276f53191 100644 --- a/gnu/usr.bin/binutils217/Makefile.inc0 +++ b/gnu/usr.bin/binutils217/Makefile.inc0 @@ -1,4 +1,4 @@ -# $DragonFly: src/gnu/usr.bin/binutils217/Makefile.inc0,v 1.1 2007/04/13 12:24:32 corecode Exp $ +# $DragonFly: src/gnu/usr.bin/binutils217/Makefile.inc0,v 1.2 2008/11/03 00:25:44 pavalos Exp $ # # This is included explicitly at the top of each sub-Makefile. We can't # use the normal "Makefile.inc" mechanism, because we need some of these @@ -19,7 +19,6 @@ RELTOP:= .. RELSRC= ${RELTOP}/../../../contrib/binutils-2.17 SRCDIR= ${.CURDIR}/${RELSRC} -CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I. .if exists(${.CURDIR}/${BINUTIL_ARCH}) CFLAGS+= -I${.CURDIR}/${BINUTIL_ARCH} diff --git a/lib/libm/Makefile b/lib/libm/Makefile index 2124be84f3..a574b2aa2f 100644 --- a/lib/libm/Makefile +++ b/lib/libm/Makefile @@ -1,8 +1,8 @@ -# $DragonFly: src/lib/libm/Makefile,v 1.7 2007/06/17 17:46:01 pavalos Exp $ +# $DragonFly: src/lib/libm/Makefile,v 1.8 2008/11/03 00:25:44 pavalos Exp $ LIB= m SHLIB_MAJOR= 3 -WARNS?= 6 +WARNS?= 2 # Don't MD fragment must be included before MI fragment. ARCHDIR?= ${MACHINE_ARCH} diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index b38bbd7e24..21e1f0b16f 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libutil/Makefile,v 1.33.2.4 2001/04/25 10:04:42 ru Exp $ -# $DragonFly: src/lib/libutil/Makefile,v 1.11 2008/10/28 17:23:46 swildner Exp $ +# $DragonFly: src/lib/libutil/Makefile,v 1.12 2008/11/03 00:25:44 pavalos Exp $ LIB= util SHLIB_MAJOR= 4 @@ -13,7 +13,7 @@ SRCS= login.c login_tty.c logout.c logwtmp.c pty.c \ realhostname.c fparseln.c stub.c pidfile.c trimdomain.c \ dehumanize_number.c humanize_number.c pw_scan.c pw_util.c INCS= libutil.h login_cap.h -WARNS?= 3 +WARNS?= 2 MAN+= login.3 login_auth.3 login_tty.3 logout.3 logwtmp.3 pty.3 \ login_cap.3 login_class.3 login_times.3 login_ok.3 \ diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile index ae0b302bda..9ddc67e923 100644 --- a/sbin/ccdconfig/Makefile +++ b/sbin/ccdconfig/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sbin/ccdconfig/Makefile,v 1.2.10.1 2001/04/25 10:58:12 ru Exp $ -# $DragonFly: src/sbin/ccdconfig/Makefile,v 1.2 2003/06/17 04:27:32 dillon Exp $ +# $DragonFly: src/sbin/ccdconfig/Makefile,v 1.3 2008/11/03 00:25:44 pavalos Exp $ PROG= ccdconfig MAN= ccdconfig.8 @@ -9,5 +9,6 @@ LDADD+= -lkvm DPADD+= ${LIBKVM} BINGRP= kmem BINMODE= 2555 +WARNS?= 4 .include diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile index 4d7f82ce5f..82b1f7a3a5 100644 --- a/sbin/dhclient/Makefile +++ b/sbin/dhclient/Makefile @@ -1,5 +1,5 @@ # $OpenBSD: Makefile,v 1.12 2005/07/17 19:33:55 krw Exp $ -# $DragonFly: src/sbin/dhclient/Makefile,v 1.4 2008/08/30 16:07:58 hasso Exp $ +# $DragonFly: src/sbin/dhclient/Makefile,v 1.5 2008/11/03 00:25:44 pavalos Exp $ # # Copyright (c) 1996, 1997 The Internet Software Consortium. # All rights reserved. @@ -40,7 +40,7 @@ SRCS= dhclient.c clparse.c dispatch.c bpf.c options.c \ PROG= dhclient MAN= dhclient.8 dhclient.conf.5 dhclient.leases.5 dhclient-script.8 -WARNS?= 3 +WARNS?= 0 beforeinstall: ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ diff --git a/sbin/disklabel64/crc32.c b/sbin/disklabel64/crc32.c index cc7641ac38..e3d6fbed68 100644 --- a/sbin/disklabel64/crc32.c +++ b/sbin/disklabel64/crc32.c @@ -26,11 +26,13 @@ * CRC32 code derived from work by Gary S. Brown. * * $FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $ - * $DragonFly: src/sbin/disklabel64/crc32.c,v 1.1 2007/06/19 02:53:55 dillon Exp $ + * $DragonFly: src/sbin/disklabel64/crc32.c,v 1.2 2008/11/03 00:25:45 pavalos Exp $ */ #include +uint32_t crc32(const void *, size_t); + static uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, @@ -91,4 +93,3 @@ crc32(const void *buf, size_t size) return crc ^ ~0U; } - diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile index d2a9335b7a..1157487bb8 100644 --- a/sbin/ipfw/Makefile +++ b/sbin/ipfw/Makefile @@ -1,9 +1,9 @@ # $FreeBSD: src/sbin/ipfw/Makefile,v 1.6.6.3 2002/07/24 03:21:23 luigi Exp $ -# $DragonFly: src/sbin/ipfw/Makefile,v 1.4 2007/09/02 13:27:23 sephe Exp $ +# $DragonFly: src/sbin/ipfw/Makefile,v 1.5 2008/11/03 00:25:45 pavalos Exp $ PROG= ipfw MAN= ipfw.8 SRCS= ipfw2.c -WARNS?= 2 +WARNS?= 1 .include diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile index 0c7c3e7927..183881b680 100644 --- a/sbin/md5/Makefile +++ b/sbin/md5/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/9/93 # $FreeBSD: src/sbin/md5/Makefile,v 1.10 2005/03/09 19:23:04 cperciva Exp $ -# $DragonFly: src/sbin/md5/Makefile,v 1.6 2008/01/16 14:18:57 matthias Exp $ +# $DragonFly: src/sbin/md5/Makefile,v 1.7 2008/11/03 00:25:45 pavalos Exp $ PROG= md5 @@ -12,7 +12,7 @@ MLINKS= md5.1 rmd160.1 \ md5.1 sha1.1 \ md5.1 sha256.1 -WFORMAT?= 1 +WARNS?= 0 DPADD= ${LIBMD} LDADD= -lmd diff --git a/sbin/route/Makefile b/sbin/route/Makefile index 3a8cbf02fb..1ab7c637f8 100644 --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD: src/sbin/route/Makefile,v 1.11.2.3 2002/12/04 14:05:42 ru Exp $ -# $DragonFly: src/sbin/route/Makefile,v 1.6 2006/10/17 00:55:43 pavalos Exp $ +# $DragonFly: src/sbin/route/Makefile,v 1.7 2008/11/03 00:25:45 pavalos Exp $ PROG= route MAN= route.8 @@ -8,6 +8,7 @@ SRCS= route.c show.c keywords.h keywords.c CFLAGS+=-I. -DNS CFLAGS+=-DINET6 CLEANFILES+=keywords.h keywords.c _keywords.tmp +WARNS?= 3 keywords.h: echo -e "extern struct keytab {\n\tconst char\t*kt_cp;\n\tint\t\t kt_i;\n} keywords[];\n\n" > ${.TARGET} diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile index 37ea63f86f..1204f76e99 100644 --- a/sbin/routed/rtquery/Makefile +++ b/sbin/routed/rtquery/Makefile @@ -1,10 +1,11 @@ # $Revision: 1.6 $ # $FreeBSD: src/sbin/routed/rtquery/Makefile,v 1.7.2.1 2001/04/25 10:58:50 ru Exp $ -# $DragonFly: src/sbin/routed/rtquery/Makefile,v 1.4 2006/10/17 00:55:43 pavalos Exp $ +# $DragonFly: src/sbin/routed/rtquery/Makefile,v 1.5 2008/11/03 00:25:45 pavalos Exp $ PROG= rtquery MAN= rtquery.8 LDADD+= -lmd DPADD+= ${LIBMD} +WARNS?= 4 .include diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index 93d1720191..1806d3ca73 100644 --- a/secure/lib/libtelnet/Makefile +++ b/secure/lib/libtelnet/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/secure/lib/libtelnet/Makefile,v 1.17.2.7 2002/07/22 14:21:51 ru Exp $ -# $DragonFly: src/secure/lib/libtelnet/Makefile,v 1.3 2005/07/28 19:48:40 joerg Exp $ +# $DragonFly: src/secure/lib/libtelnet/Makefile,v 1.4 2008/11/03 00:25:45 pavalos Exp $ LIB= telnet @@ -11,7 +11,7 @@ SRCS= genget.c getent.c misc.c encrypt.c auth.c \ CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \ -I${TELNETDIR} -I${TELNETDIR}/libtelnet -WARNS?= 2 +WARNS?= 0 INCS= ${TELNETDIR}/arpa/telnet.h INCSDIR= ${INCLUDEDIR}/arpa diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 05d800e08e..36a7e3581d 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/secure/libexec/telnetd/Makefile,v 1.19.2.4 2002/07/03 22:20:25 des Exp $ -# $DragonFly: src/secure/libexec/telnetd/Makefile,v 1.3 2005/01/11 13:22:40 joerg Exp $ +# $DragonFly: src/secure/libexec/telnetd/Makefile,v 1.4 2008/11/03 00:25:45 pavalos Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -14,7 +14,7 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ -DENV_HACK -DAUTHENTICATION -DENCRYPTION \ -I${TELNETDIR} -DINET6 -WARNS?= 2 +WARNS?= 0 WFORMAT?= 0 DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} \ diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index aed3509b37..b5e7e9fee1 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/secure/usr.bin/telnet/Makefile,v 1.21.2.4 2002/07/03 22:20:33 des Exp $ -# $DragonFly: src/secure/usr.bin/telnet/Makefile,v 1.3 2005/01/11 13:22:41 joerg Exp $ +# $DragonFly: src/secure/usr.bin/telnet/Makefile,v 1.4 2008/11/03 00:25:45 pavalos Exp $ PROG= telnet @@ -10,7 +10,7 @@ CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \ -I${TELNETDIR} -I${TELNETDIR}/libtelnet/ -WARNS?= 2 +WARNS?= 0 DPADD= ${LIBTERMCAP} ${LIBTELNET} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 3bdc97e30a..45c5bf836e 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ -.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.37 2008/07/26 16:25:30 pavalos Exp $ +.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.38 2008/11/03 00:25:45 pavalos Exp $ .\" .Dd July 12, 2008 .Dt MAKE.CONF 5 @@ -261,12 +261,6 @@ The documentation .Ar supfile to use when doing a .Dq Li "make update" . -.It Va WARNS_WERROR -Causes -.Fl Werror -to be added to -.Va CFLAGS -when WARNS is in effect. .It Va WITH_GCPIO .Pq Vt bool Set this to use diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 6bf9e1fbe2..40a35e19ba 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -1,5 +1,5 @@ # $FreeBSD: src/share/mk/bsd.sys.mk,v 1.3.2.5 2002/07/03 16:59:14 des Exp $ -# $DragonFly: src/share/mk/bsd.sys.mk,v 1.10 2007/09/07 00:09:02 pavalos Exp $ +# $DragonFly: src/share/mk/bsd.sys.mk,v 1.11 2008/11/03 00:25:45 pavalos Exp $ # # This file contains common settings used for building DragonFly # sources. @@ -8,29 +8,44 @@ # overridden (e.g. if using a non-gcc compiler) by defining NO_WARNS. .if !defined(NO_WARNS) -. if defined(WARNS) -# XXX Delete -Wuninitialized by default for now -- the compiler doesn't -# XXX always get it right. -. if ${WARNS} <= 4 -CFLAGS += -Wno-uninitialized -. endif -. if defined(WARNS_WERROR) && !defined(NO_WERROR) -CFLAGS += -Werror +. if defined(CSTD) +. if ${CSTD} == "k&r" +CFLAGS += -traditional +. elif ${CSTD} == "c89" || ${CSTD} == "c90" +CFLAGS += -std=iso9899:1990 +. elif ${CSTD} == "c94" || ${CSTD} == "c95" +CFLAGS += -std=iso9899:199409 +. elif ${CSTD} == "c99" +CFLAGS += -std=iso9899:1999 +. else +CFLAGS += -std=${CSTD} . endif +. endif +. if defined(WARNS) . if ${WARNS} >= 1 -CFLAGS += -Wunknown-pragmas -Wsystem-headers -.endif +CWARNFLAGS += -Wsystem-headers +. if !defined(NO_WERROR) && ${CCVER} == "gcc41" && ${MACHINE_ARCH} == "i386" +CWARNFLAGS += -Werror +. endif +. endif . if ${WARNS} >= 2 -CFLAGS += -Wall +CWARNFLAGS += -Wall . endif . if ${WARNS} >= 3 -CFLAGS += -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith +CWARNFLAGS += -W -Wno-unused-parameter -Wstrict-prototypes\ + -Wmissing-prototypes -Wpointer-arith . endif . if ${WARNS} >= 4 -CFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align +CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ + -Wshadow -Wcast-align -Wunused-parameter . endif . if ${WARNS} >= 6 -CFLAGS += -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls +CWARNFLAGS += -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls +. endif +. if ${WARNS} >= 2 && ${WARNS} <= 4 +# XXX Delete -Wuninitialized by default for now -- the compiler doesn't +# XXX always get it right. +CWARNFLAGS += -Wno-uninitialized . endif . endif @@ -39,17 +54,13 @@ WFORMAT = 1 . endif . if defined(WFORMAT) . if ${WFORMAT} > 0 -CFLAGS += -Wno-format-extra-args -. if defined(WARNS_WERROR) && !defined(NO_WERROR) -CFLAGS += -Werror +CWARNFLAGS += -Wformat=2 -Wno-format-extra-args +. if !defined(NO_WERROR) && ${CCVER} == "gcc41" && ${MACHINE_ARCH} == "i386" +CWARNFLAGS += -Werror . endif . endif . endif .endif -.if defined(WARNS_NO_UNUSED_PARAMETERS) -CFLAGS+= -Wno-unused-parameters -.endif - # Allow user-specified additional warning flags CFLAGS += ${CWARNFLAGS} diff --git a/sys/libkern/crc32.c b/sys/libkern/crc32.c index 9d5df6e05d..c66917d58e 100644 --- a/sys/libkern/crc32.c +++ b/sys/libkern/crc32.c @@ -39,7 +39,7 @@ * CRC32 code derived from work by Gary S. Brown. * * $FreeBSD: src/sys/libkern/crc32.c,v 1.1.2.1 2002/07/31 09:08:34 imp Exp $ - * $DragonFly: src/sys/libkern/crc32.c,v 1.5 2008/07/10 17:42:18 dillon Exp $ + * $DragonFly: src/sys/libkern/crc32.c,v 1.6 2008/11/03 00:25:45 pavalos Exp $ */ /* @@ -56,6 +56,7 @@ #endif uint32_t crc32(const void *buf, size_t size); +uint32_t crc32_ext(const void *buf, size_t size, uint32_t ocrc); uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile index defb89ebc5..7a79b73c48 100644 --- a/usr.bin/find/Makefile +++ b/usr.bin/find/Makefile @@ -1,11 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.bin/find/Makefile,v 1.17 2002/04/15 19:27:41 obrien Exp $ -# $DragonFly: src/usr.bin/find/Makefile,v 1.5 2007/08/27 16:50:53 pavalos Exp $ +# $DragonFly: src/usr.bin/find/Makefile,v 1.6 2008/11/03 00:25:45 pavalos Exp $ PROG= find SRCS= find.c function.c ls.c main.c misc.c operator.c option.c \ getdate.y CFLAGS+=-DHAVE_SYS_TIMEB_H -I${.CURDIR} YFLAGS= +WARNS?= 4 .include diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile index 54dc667dda..ee1d43f617 100644 --- a/usr.bin/fstat/Makefile +++ b/usr.bin/fstat/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.bin/fstat/Makefile,v 1.4.2.1 2000/07/02 10:20:24 ps Exp $ -# $DragonFly: src/usr.bin/fstat/Makefile,v 1.4 2007/08/27 16:50:53 pavalos Exp $ +# $DragonFly: src/usr.bin/fstat/Makefile,v 1.5 2008/11/03 00:25:45 pavalos Exp $ PROG= fstat SRCS= cd9660.c fstat.c msdosfs.c @@ -9,5 +9,6 @@ DPADD= ${LIBKVM} LDADD= -lkvm BINGRP= kmem BINMODE=2555 +WARNS?= 0 .include diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 2b5732ea2b..f743381eb5 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -2,7 +2,7 @@ echo Hey that hurt! # @(#)Makefile 5.2 (Berkeley) 12/28/90 # $FreeBSD: src/usr.bin/make/Makefile,v 1.13.2.1 2001/05/25 08:33:40 sobomax Exp $ -# $DragonFly: src/usr.bin/make/Makefile,v 1.37 2007/08/27 16:50:56 pavalos Exp $ +# $DragonFly: src/usr.bin/make/Makefile,v 1.38 2008/11/03 00:25:45 pavalos Exp $ PROG= make CFLAGS+=-I${.CURDIR} @@ -10,7 +10,6 @@ SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \ lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \ util.c var.c -WARNS_WERROR= YES NOSHARED?= YES CFLAGS+=-DMAKE_VERSION=\"5200408120\" diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile index 6e07cdf71e..2b65cbc129 100644 --- a/usr.bin/mkstr/Makefile +++ b/usr.bin/mkstr/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $DragonFly: src/usr.bin/mkstr/Makefile,v 1.3 2007/08/27 16:50:56 pavalos Exp $ +# $DragonFly: src/usr.bin/mkstr/Makefile,v 1.4 2008/11/03 00:25:45 pavalos Exp $ PROG= mkstr +WARNS?= 2 .include diff --git a/usr.bin/truncate/Makefile b/usr.bin/truncate/Makefile index f788061a52..e33a6904b6 100644 --- a/usr.bin/truncate/Makefile +++ b/usr.bin/truncate/Makefile @@ -1,6 +1,7 @@ # $FreeBSD: src/usr.bin/truncate/Makefile,v 1.1.2.1 2000/08/04 08:05:52 sheldonh Exp $ -# $DragonFly: src/usr.bin/truncate/Makefile,v 1.4 2007/08/27 16:51:00 pavalos Exp $ +# $DragonFly: src/usr.bin/truncate/Makefile,v 1.5 2008/11/03 00:25:45 pavalos Exp $ PROG= truncate +WARNS?= 4 .include diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile index d7c7b7026e..e64575c530 100644 --- a/usr.sbin/keyserv/Makefile +++ b/usr.sbin/keyserv/Makefile @@ -1,9 +1,9 @@ # $FreeBSD: src/usr.sbin/keyserv/Makefile,v 1.5.2.1 2001/04/25 12:09:50 ru Exp $ -# $DragonFly: src/usr.sbin/keyserv/Makefile,v 1.4 2005/01/11 13:22:40 joerg Exp $ +# $DragonFly: src/usr.sbin/keyserv/Makefile,v 1.5 2008/11/03 00:25:45 pavalos Exp $ PROG= keyserv SRCS= keyserv.c setkey.c keyserv_uid.c crypt_svc.c crypt_server.c crypt.h -WARNS?= 6 +WARNS?= 1 MAN= keyserv.8 diff --git a/usr.sbin/pciconf/Makefile b/usr.sbin/pciconf/Makefile index 4bb625fd73..2023eb7c64 100644 --- a/usr.sbin/pciconf/Makefile +++ b/usr.sbin/pciconf/Makefile @@ -1,10 +1,10 @@ # $ANA: Makefile,v 1.1.1.1 1996/09/25 21:12:57 wollman Exp $ # $FreeBSD: src/usr.sbin/pciconf/Makefile,v 1.6.6.1 2001/04/25 12:10:26 ru Exp $ -# $DragonFly: src/usr.sbin/pciconf/Makefile,v 1.3 2005/01/01 22:06:25 cpressey Exp $ +# $DragonFly: src/usr.sbin/pciconf/Makefile,v 1.4 2008/11/03 00:25:45 pavalos Exp $ PROG= pciconf MAN= pciconf.8 CFLAGS+= -I${.CURDIR}/../../sys -WARNS?= 6 +WARNS?= 4 .include diff --git a/usr.sbin/pfctl/pfctl_altq.c b/usr.sbin/pfctl/pfctl_altq.c index 4587ebf391..c7efc6368e 100644 --- a/usr.sbin/pfctl/pfctl_altq.c +++ b/usr.sbin/pfctl/pfctl_altq.c @@ -1,5 +1,5 @@ /* $OpenBSD: pfctl_altq.c,v 1.83 2004/03/14 21:51:44 dhartmei Exp $ */ -/* $DragonFly: src/usr.sbin/pfctl/pfctl_altq.c,v 1.3 2008/04/06 18:58:14 dillon Exp $ */ +/* $DragonFly: src/usr.sbin/pfctl/pfctl_altq.c,v 1.4 2008/11/03 00:25:45 pavalos Exp $ */ /* * Copyright (c) 2002 @@ -1042,7 +1042,9 @@ print_fairq_opts(const struct pf_altq *a, const struct node_queue_opt *qopts) /* * admission control using generalized service curve */ +#ifndef INFINITY #define INFINITY HUGE_VAL /* positive infinity defined in */ +#endif /* add a new service curve to a generalized service curve */ static void diff --git a/usr.sbin/pflogd/Makefile b/usr.sbin/pflogd/Makefile index 45c178ace8..c29a188f56 100644 --- a/usr.sbin/pflogd/Makefile +++ b/usr.sbin/pflogd/Makefile @@ -1,5 +1,5 @@ # $OpenBSD: Makefile,v 1.6 2003/11/20 23:23:09 avsm Exp $ -# $DragonFly: src/usr.sbin/pflogd/Makefile,v 1.1 2004/09/21 21:25:28 joerg Exp $ +# $DragonFly: src/usr.sbin/pflogd/Makefile,v 1.2 2008/11/03 00:25:45 pavalos Exp $ LDADD+= -lpcap -lutil DPAPP+= ${LIBPCAP} ${LIBUTIL} @@ -7,6 +7,6 @@ DPAPP+= ${LIBPCAP} ${LIBUTIL} PROG= pflogd SRCS= pflogd.c privsep.c privsep_fdpass.c MAN= pflogd.8 -WARNS?= 6 +WARNS?= 4 .include diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile index 5eb2a451b9..9a67a5d27d 100644 --- a/usr.sbin/pstat/Makefile +++ b/usr.sbin/pstat/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.sbin/pstat/Makefile,v 1.5.6.1 2001/04/25 12:10:38 ru Exp $ -# $DragonFly: src/usr.sbin/pstat/Makefile,v 1.7 2005/02/03 17:44:21 joerg Exp $ +# $DragonFly: src/usr.sbin/pstat/Makefile,v 1.8 2008/11/03 00:25:45 pavalos Exp $ PROG= pstat CFLAGS+=-I${.CURDIR}/../../sys @@ -12,6 +12,6 @@ LDADD= -lkcore -lkinfo -lkvm MAN= pstat.8 LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo MLINKS= pstat.8 swapinfo.8 -WARNS?= 6 +WARNS?= 0 .include -- 2.41.0