Module Name: src
Committed By: joerg
Date: Tue Dec 23 20:26:30 UTC 2014
Modified Files:
src/external/bsd/ntp/lib/libiscntp: Makefile
src/external/bsd/ntp/lib/libntp: Makefile
src/external/bsd/ntp/lib/libopts: Makefile
Log Message:
Use positive checks for GCC 4.1. Deal with missing HAVE_GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/lib/libntp/Makefile
cvs rdiff -u -r1.12 -r1.13 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/lib/libiscntp/Makefile
diff -u src/external/bsd/ntp/lib/libiscntp/Makefile:1.12 src/external/bsd/ntp/lib/libiscntp/Makefile:1.13
--- src/external/bsd/ntp/lib/libiscntp/Makefile:1.12 Tue Dec 23 20:19:08 2014
+++ src/external/bsd/ntp/lib/libiscntp/Makefile Tue Dec 23 20:26:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/12/23 20:19:08 christos Exp $
+# $NetBSD: Makefile,v 1.13 2014/12/23 20:26:30 joerg Exp $
LIBISPRIVATE=yes
@@ -44,7 +44,7 @@ SRCS= assertions.c \
time.c \
sockaddr.c
-.if ${HAVE_GCC} != 4
+.if ${HAVE_GCC:U} != 4
COPTS.log.c+= -Wno-error=format-nonliteral
.endif
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.16 src/external/bsd/ntp/lib/libntp/Makefile:1.17
--- src/external/bsd/ntp/lib/libntp/Makefile:1.16 Tue Dec 23 20:19:08 2014
+++ src/external/bsd/ntp/lib/libntp/Makefile Tue Dec 23 20:26:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/12/23 20:19:08 christos Exp $
+# $NetBSD: Makefile,v 1.17 2014/12/23 20:26:30 joerg Exp $
LIBISPRIVATE=yes
@@ -79,10 +79,10 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
-.if ${HAVE_GCC} != 4
-COPTS.msyslog.c+= -Wno-error=format-nonliteral
-.else
+.if ${HAVE_GCC:U} == 4
COPTS.systime.c+= -Wno-uninitialized
+.else
+COPTS.msyslog.c+= -Wno-error=format-nonliteral
.endif
# For MKREPRO, avoid using __DATE__ and __TIME__.
Index: src/external/bsd/ntp/lib/libopts/Makefile
diff -u src/external/bsd/ntp/lib/libopts/Makefile:1.12 src/external/bsd/ntp/lib/libopts/Makefile:1.13
--- src/external/bsd/ntp/lib/libopts/Makefile:1.12 Tue Dec 23 20:19:08 2014
+++ src/external/bsd/ntp/lib/libopts/Makefile Tue Dec 23 20:26:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/12/23 20:19:08 christos Exp $
+# $NetBSD: Makefile,v 1.13 2014/12/23 20:26:30 joerg Exp $
LIBISPRIVATE=yes
@@ -17,10 +17,10 @@ CPPFLAGS+=-I${DIST}
SRCS=libopts.c
COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
-.if ${HAVE_GCC} != 4
-COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
-.else
+.if ${HAVE_GCC:U} == 4
COPTS.libopts.c+= -Wno-error
+.else
+COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
.endif
.include <bsd.lib.mk>
