Module Name: src
Committed By: joerg
Date: Thu Jan 2 21:38:38 UTC 2014
Modified Files:
src/external/bsd/ntp: Makefile.inc
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/lib/libiscntp: Makefile
src/external/bsd/ntp/lib/libntp: Makefile
src/external/bsd/ntp/lib/libopts: Makefile
Log Message:
Update warning flags to reflect the fixes. Restrict GCC flags to GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/lib/libntp/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/lib/libopts/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.12 src/external/bsd/ntp/Makefile.inc:1.13
--- src/external/bsd/ntp/Makefile.inc:1.12 Sat Sep 21 22:28:12 2013
+++ src/external/bsd/ntp/Makefile.inc Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2013/09/21 22:28:12 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.13 2014/01/02 21:38:38 joerg Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -7,7 +7,6 @@ USE_FORT?= yes # network client/server
CWARNFLAGS+= -Wno-missing-noreturn
CWARNFLAGS.clang+= -Wno-unneeded-internal-declaration \
- -Wno-format-security \
-Wno-parentheses -Wno-constant-logical-operand \
-Wno-error=unused-const-variable
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.14 src/external/bsd/ntp/bin/ntpd/Makefile:1.15
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.14 Mon Dec 30 17:48:13 2013
+++ src/external/bsd/ntp/bin/ntpd/Makefile Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/12/30 17:48:13 christos Exp $
+# $NetBSD: Makefile,v 1.15 2014/01/02 21:38:38 joerg Exp $
.include <bsd.own.mk>
@@ -73,7 +73,7 @@ SRCS= cmd_args.c \
LDADD+= -L${LIBPARSE} -lparse -L${LIBISC} -liscntp -lm -lutil
DPADD+= ${LIBPARSE}/libparse.a ${LIBISC}/libiscntp.a ${LIBOPTS}/libopts.a ${LIBNTP}/libntp.a ${LIBM} ${LIBUTIL}
-CWARNFLAGS.clang+= -Wno-strncat-size
+COPTS.ntp_control.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=format-nonliteral :}
.include "${.CURDIR}/../Makefile.inc"
@@ -83,8 +83,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
.PATH: ${DIST}
-COPTS.ntp_control.c+= -Wno-format-nonliteral
-
.include <bsd.prog.mk>
# kill default .y.c rule - to rebuild ntp_parser.c we need bison which is not part of the toolchain
Index: src/external/bsd/ntp/lib/libiscntp/Makefile
diff -u src/external/bsd/ntp/lib/libiscntp/Makefile:1.5 src/external/bsd/ntp/lib/libiscntp/Makefile:1.6
--- src/external/bsd/ntp/lib/libiscntp/Makefile:1.5 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/lib/libiscntp/Makefile Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.6 2014/01/02 21:38:38 joerg Exp $
LIBISPRIVATE=yes
@@ -43,6 +43,6 @@ SRCS= assertions.c \
time.c \
sockaddr.c
-COPTS.log.c+= -Wno-format-nonliteral
+COPTS.log.c+= -Wno-error=format-nonliteral
.include <bsd.lib.mk>
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.6 src/external/bsd/ntp/lib/libntp/Makefile:1.7
--- src/external/bsd/ntp/lib/libntp/Makefile:1.6 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/lib/libntp/Makefile Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.7 2014/01/02 21:38:38 joerg Exp $
LIBISPRIVATE=yes
@@ -75,10 +75,8 @@ work_fork.c \
work_thread.c \
ymd2yd.c
-COPTS.msyslog.c+= -Wno-format-nonliteral
-COPTS.prettydate.c=-Wno-format-nonliteral
-COPTS.timetoa.c=-Wno-format-nonliteral
CPPFLAGS+= -I${IDIST}/sntp/libopts
+COPTS.msyslog.c+= -Wno-error=format-nonliteral
.include <bsd.lib.mk>
Index: src/external/bsd/ntp/lib/libopts/Makefile
diff -u src/external/bsd/ntp/lib/libopts/Makefile:1.7 src/external/bsd/ntp/lib/libopts/Makefile:1.8
--- src/external/bsd/ntp/lib/libopts/Makefile:1.7 Sun Dec 29 03:32:00 2013
+++ src/external/bsd/ntp/lib/libopts/Makefile Thu Jan 2 21:38:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/12/29 03:32:00 christos Exp $
+# $NetBSD: Makefile,v 1.8 2014/01/02 21:38:38 joerg Exp $
LIBISPRIVATE=yes
@@ -16,17 +16,9 @@ CPPFLAGS+=-I${DIST}
SRCS=libopts.c
-COPTS.libopts.c += -Wno-format-nonliteral -Wno-error -DPOSIX_SHELL="\"/bin/sh\""
-
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
-COPTS.libopts.c += -Wno-format-contains-nul
-COPTS.find.c += -Wno-format-contains-nul
-COPTS.makeshell.c += -Wno-format-contains-nul
-COPTS.nested.c += -Wno-format-contains-nul
-COPTS.pgusage.c += -Wno-format-contains-nul
-COPTS.putshell.c += -Wno-format-contains-nul
-COPTS.save.c += -Wno-format-contains-nul
-COPTS.usage.c += -Wno-format-contains-nul
+COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
+.if ${HAVE_GCC:U} >= 45
+COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
.endif
.include <bsd.lib.mk>
