svn commit: r246880 - in head: lib/libsm libexec/mail.local libexec/smrsh share/mk usr.bin/vacation usr.sbin/sendmail

[Dimitry Andric]

Author: dim
Date: Sat Feb 16 20:17:31 2013
New Revision: 246880
URL: http://svnweb.freebsd.org/changeset/base/246880

Log:
  Since clang 3.2 now has an option to suppress warnings about implicitly
  promoted K&R parameters, remove the workarounds added for sendmail
  components in r228558.
  
  MFC after:	1 week

Modified:
  head/lib/libsm/Makefile
  head/libexec/mail.local/Makefile
  head/libexec/smrsh/Makefile
  head/share/mk/bsd.sys.mk
  head/usr.bin/vacation/Makefile
  head/usr.sbin/sendmail/Makefile

Modified: head/lib/libsm/Makefile
==============================================================================
--- head/lib/libsm/Makefile	Sat Feb 16 19:11:57 2013	(r246879)
+++ head/lib/libsm/Makefile	Sat Feb 16 20:17:31 2013	(r246880)
@@ -18,11 +18,6 @@ CFLAGS+=${SENDMAIL_CFLAGS}
 
 WARNS?=	2
 
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet.  Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
 LIB=	sm
 
 SRCS+=	sm_os.h

Modified: head/libexec/mail.local/Makefile
==============================================================================
--- head/libexec/mail.local/Makefile	Sat Feb 16 19:11:57 2013	(r246879)
+++ head/libexec/mail.local/Makefile	Sat Feb 16 20:17:31 2013	(r246880)
@@ -12,11 +12,6 @@ CFLAGS+=-I${SENDMAIL_DIR}/include -I.
 WARNS?=	2
 WFORMAT=0
 
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet.  Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
 

Modified: head/libexec/smrsh/Makefile
==============================================================================
--- head/libexec/smrsh/Makefile	Sat Feb 16 19:11:57 2013	(r246879)
+++ head/libexec/smrsh/Makefile	Sat Feb 16 20:17:31 2013	(r246880)
@@ -17,11 +17,6 @@ LDADD=	${LIBSM}
 
 WARNS?=	2
 
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet.  Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h
 

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Sat Feb 16 19:11:57 2013	(r246879)
+++ head/share/mk/bsd.sys.mk	Sat Feb 16 20:17:31 2013	(r246880)
@@ -72,7 +72,7 @@ CWARNFLAGS+=	-Wno-tautological-compare -
 		-Wno-parentheses-equality -Wno-unused-function -Wno-conversion
 .endif # WARNS <= 3
 .if ${WARNS} <= 2
-CWARNFLAGS+=	-Wno-switch -Wno-switch-enum
+CWARNFLAGS+=	-Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter
 .endif # WARNS <= 2
 .if ${WARNS} <= 1
 CWARNFLAGS+=	-Wno-parentheses

Modified: head/usr.bin/vacation/Makefile
==============================================================================
--- head/usr.bin/vacation/Makefile	Sat Feb 16 19:11:57 2013	(r246879)
+++ head/usr.bin/vacation/Makefile	Sat Feb 16 20:17:31 2013	(r246880)
@@ -11,11 +11,6 @@ CFLAGS+=-D_FFR_LISTDB -D_FFR_DEBUG
 
 WARNS?=	2
 
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet.  Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
 

Modified: head/usr.sbin/sendmail/Makefile
==============================================================================
--- head/usr.sbin/sendmail/Makefile	Sat Feb 16 19:11:57 2013	(r246879)
+++ head/usr.sbin/sendmail/Makefile	Sat Feb 16 20:17:31 2013	(r246880)
@@ -45,11 +45,6 @@ CFLAGS+= -DNETINET6
 
 WARNS?=	1
 
-# Unfortunately, clang gives warnings about sendmail code that cannot
-# be turned off yet.  Since this is contrib code, and we don't really
-# care about the warnings, just make them non-fatal for now.
-NO_WERROR.clang=
-
 DPADD=	${LIBUTIL} ${LIBWRAP}
 LDADD=	-lutil -lwrap