svn commit: r279041 - in stable/8: sbin/hastctl sbin/hastd usr.bin/mklocale usr.sbin/bsnmpd/modules usr.sbin/config

[Ian Lepore]

Author: ian
Date: Fri Feb 20 05:23:51 2015
New Revision: 279041
URL: https://svnweb.freebsd.org/changeset/base/279041

Log:
  Lower some WARNS from 6 to 5 to eliminate redundant redeclaration errors
  on yylex().  This allows stable-8 to build on machines running 10 or later
  (with a newer yacc that emits its own declaration) and also keep building
  on older machines with a yacc that doesn't do so.
  
  This is a direct commit to stable-8 because it fixes a problem that doesn't
  exist on later branches.

Modified:
  stable/8/sbin/hastctl/Makefile
  stable/8/sbin/hastd/Makefile
  stable/8/usr.bin/mklocale/Makefile
  stable/8/usr.sbin/bsnmpd/modules/Makefile.inc
  stable/8/usr.sbin/config/Makefile

Modified: stable/8/sbin/hastctl/Makefile
==============================================================================
--- stable/8/sbin/hastctl/Makefile	Fri Feb 20 05:17:24 2015	(r279040)
+++ stable/8/sbin/hastctl/Makefile	Fri Feb 20 05:23:51 2015	(r279041)
@@ -17,7 +17,9 @@ SRCS+=	proto.c proto_common.c proto_uds.
 SRCS+=	token.l
 SRCS+=	subr.c
 SRCS+=	y.tab.h
-WARNS?=	6
+.warning WARNS is ${WARNS}
+WARNS?=	5
+.warning WARNS is now ${WARNS}
 MAN=	hastctl.8
 
 NO_WFORMAT=

Modified: stable/8/sbin/hastd/Makefile
==============================================================================
--- stable/8/sbin/hastd/Makefile	Fri Feb 20 05:17:24 2015	(r279040)
+++ stable/8/sbin/hastd/Makefile	Fri Feb 20 05:23:51 2015	(r279041)
@@ -17,7 +17,9 @@ SRCS+=	rangelock.c
 SRCS+=	subr.c
 SRCS+=	token.l
 SRCS+=	y.tab.h
-WARNS?=	6
+.warning WARNS is ${WARNS}
+WARNS?=	5
+.warning WARNS is now ${WARNS}
 MAN=	hastd.8 hast.conf.5
 
 NO_WFORMAT=

Modified: stable/8/usr.bin/mklocale/Makefile
==============================================================================
--- stable/8/usr.bin/mklocale/Makefile	Fri Feb 20 05:17:24 2015	(r279040)
+++ stable/8/usr.bin/mklocale/Makefile	Fri Feb 20 05:23:51 2015	(r279041)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	mklocale
-WARNS?=	6
+WARNS?=	5
 SRCS=	yacc.y lex.l y.tab.h
 CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale
 

Modified: stable/8/usr.sbin/bsnmpd/modules/Makefile.inc
==============================================================================
--- stable/8/usr.sbin/bsnmpd/modules/Makefile.inc	Fri Feb 20 05:17:24 2015	(r279040)
+++ stable/8/usr.sbin/bsnmpd/modules/Makefile.inc	Fri Feb 20 05:23:51 2015	(r279041)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SHLIB_MAJOR=	6
-WARNS?=		6
+WARNS?=		5
 
 MANFILTER=	sed -e 's%@MODPATH@%${LIBDIR}/%g'		\
 		    -e 's%@DEFPATH@%${DEFSDIR}/%g'		\

Modified: stable/8/usr.sbin/config/Makefile
==============================================================================
--- stable/8/usr.sbin/config/Makefile	Fri Feb 20 05:17:24 2015	(r279040)
+++ stable/8/usr.sbin/config/Makefile	Fri Feb 20 05:23:51 2015	(r279041)
@@ -9,7 +9,7 @@ SRCS=	config.y main.c lang.l mkmakefile.
 kernconf.c: kernconf.tmpl
 	file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
 
-WARNS?=	6
+WARNS?=	5
 CFLAGS+= -I. -I${.CURDIR}
 
 DPADD=	${LIBL} ${LIBSBUF}