[src/trunk]: src/external/bsd/ntp/lib Use positive checks for GCC 4.1. Deal w...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a2177ea43f5b
branches:  trunk
changeset: 335074:a2177ea43f5b
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Dec 23 20:26:30 2014 +0000

description:
Use positive checks for GCC 4.1. Deal with missing HAVE_GCC.

diffstat:

 external/bsd/ntp/lib/libiscntp/Makefile |  4 ++--
 external/bsd/ntp/lib/libntp/Makefile    |  8 ++++----
 external/bsd/ntp/lib/libopts/Makefile   |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (64 lines):

diff -r f3e51343f2ea -r a2177ea43f5b external/bsd/ntp/lib/libiscntp/Makefile
--- a/external/bsd/ntp/lib/libiscntp/Makefile   Tue Dec 23 20:19:08 2014 +0000
+++ b/external/bsd/ntp/lib/libiscntp/Makefile   Tue Dec 23 20:26:30 2014 +0000
@@ -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 @@
         time.c                     \
         sockaddr.c
 
-.if ${HAVE_GCC} != 4
+.if ${HAVE_GCC:U} != 4
 COPTS.log.c+=  -Wno-error=format-nonliteral
 .endif
 
diff -r f3e51343f2ea -r a2177ea43f5b external/bsd/ntp/lib/libntp/Makefile
--- a/external/bsd/ntp/lib/libntp/Makefile      Tue Dec 23 20:19:08 2014 +0000
+++ b/external/bsd/ntp/lib/libntp/Makefile      Tue Dec 23 20:26:30 2014 +0000
@@ -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 @@
 
 CPPFLAGS+= -I${IDIST}/sntp/libopts
 
-.if ${HAVE_GCC} != 4
+.if ${HAVE_GCC:U} == 4
+COPTS.systime.c+=      -Wno-uninitialized
+.else
 COPTS.msyslog.c+=      -Wno-error=format-nonliteral
-.else
-COPTS.systime.c+=      -Wno-uninitialized
 .endif
 
 # For MKREPRO, avoid using __DATE__ and __TIME__.
diff -r f3e51343f2ea -r a2177ea43f5b external/bsd/ntp/lib/libopts/Makefile
--- a/external/bsd/ntp/lib/libopts/Makefile     Tue Dec 23 20:19:08 2014 +0000
+++ b/external/bsd/ntp/lib/libopts/Makefile     Tue Dec 23 20:26:30 2014 +0000
@@ -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 @@
 SRCS=libopts.c
 
 COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
-.if ${HAVE_GCC} != 4
+.if ${HAVE_GCC:U} == 4
+COPTS.libopts.c+=      -Wno-error
+.else
 COPTS.libopts.c+=      ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
-.else
-COPTS.libopts.c+=      -Wno-error
 .endif
 
 .include <bsd.lib.mk>