[src/trunk]: src Don't depend on HAVE_GCC being always defined.

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

details:   https://anonhg.NetBSD.org/src/rev/54b047e69144
branches:  trunk
changeset: 780877:54b047e69144
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 10 12:20:10 2012 +0000

description:
Don't depend on HAVE_GCC being always defined.

diffstat:

 crypto/external/bsd/openssh/bin/sftp/Makefile       |  8 +++-----
 crypto/external/bsd/openssh/bin/ssh-keygen/Makefile |  8 +++-----
 crypto/external/bsd/openssh/bin/ssh/Makefile        |  4 +---
 crypto/external/bsd/openssh/bin/sshd/Makefile       |  4 +---
 crypto/external/bsd/openssh/lib/Makefile            |  8 +++-----
 lib/libc/rpc/Makefile.inc                           |  4 ++--
 lib/libedit/Makefile                                |  4 ++--
 lib/libtelnet/Makefile                              |  4 +---
 sbin/dump/Makefile                                  |  4 +---
 sbin/fsck_ffs/Makefile                              |  4 +---
 sbin/fsdb/Makefile                                  |  4 +---
 sbin/mount_smbfs/Makefile.inc                       |  4 +---
 sbin/newfs/Makefile                                 |  8 +++-----
 sbin/newfs_v7fs/Makefile                            |  4 +---
 14 files changed, 24 insertions(+), 48 deletions(-)

diffs (274 lines):

diff -r 80a47807c1c8 -r 54b047e69144 crypto/external/bsd/openssh/bin/sftp/Makefile
--- a/crypto/external/bsd/openssh/bin/sftp/Makefile     Fri Aug 10 12:18:14 2012 +0000
+++ b/crypto/external/bsd/openssh/bin/sftp/Makefile     Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/06/20 07:43:56 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2012/08/10 12:20:11 joerg Exp $
 
 BINDIR=        /usr/bin
 
@@ -9,9 +9,7 @@
 LDADD+=        -ledit -lterminfo
 DPADD+=        ${LIBEDIT} ${LIBTERMINFO}
 
-.include <bsd.prog.mk>
-
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.sftp.c+=         -Wno-pointer-sign
 COPTS.sftp-client.c+=  -Wno-pointer-sign
-.endif
+
+.include <bsd.prog.mk>
diff -r 80a47807c1c8 -r 54b047e69144 crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile       Fri Aug 10 12:18:14 2012 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile       Fri Aug 10 12:20:10 2012 +0000
@@ -1,12 +1,10 @@
-#      $NetBSD: Makefile,v 1.3 2011/06/20 07:43:56 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2012/08/10 12:20:12 joerg Exp $
 
 BINDIR=        /usr/bin
 
 PROG=  ssh-keygen
 SRCS=  ssh-keygen.c moduli.c
 
-.include <bsd.prog.mk>
+COPTS.ssh-keygen.c=    -Wno-pointer-sign
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
-COPTS.ssh-keygen.c=    -Wno-pointer-sign
-.endif
+.include <bsd.prog.mk>
diff -r 80a47807c1c8 -r 54b047e69144 crypto/external/bsd/openssh/bin/ssh/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh/Makefile      Fri Aug 10 12:18:14 2012 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh/Makefile      Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2011/08/17 05:32:09 christos Exp $
+#      $NetBSD: Makefile,v 1.8 2012/08/10 12:20:12 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -10,10 +10,8 @@
        roaming_common.c roaming_client.c
 
 COPTS.sshconnect1.c=   -fno-strict-aliasing
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.mux.c=           -Wno-pointer-sign
 COPTS.sshconnect2.c=   -Wno-pointer-sign
-.endif
 
 LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
 MAN=   ssh.1 ssh_config.5
diff -r 80a47807c1c8 -r 54b047e69144 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile     Fri Aug 10 12:18:14 2012 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile     Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2011/09/07 17:49:19 christos Exp $
+#      $NetBSD: Makefile,v 1.9 2012/08/10 12:20:12 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -18,9 +18,7 @@
        auth2-jpake.c \
        roaming_common.c roaming_serv.c sandbox-rlimit.c
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.auth-options.c=  -Wno-pointer-sign
-.endif
 COPTS.ldapauth.c=      -Wno-format-nonliteral  # XXX: should fix
 
 .if (${USE_PAM} != "no")
diff -r 80a47807c1c8 -r 54b047e69144 crypto/external/bsd/openssh/lib/Makefile
--- a/crypto/external/bsd/openssh/lib/Makefile  Fri Aug 10 12:18:14 2012 +0000
+++ b/crypto/external/bsd/openssh/lib/Makefile  Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2011/07/25 03:03:33 christos Exp $
+#      $NetBSD: Makefile,v 1.11 2012/08/10 12:20:12 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -72,13 +72,11 @@
                crypt   ${NETBSDSRCDIR}/lib/libcrypt \
                z       ${NETBSDSRCDIR}/lib/libz
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 .for f in dns channels hostfile ssh-pkcs11
 COPTS.${f}.c+= -Wno-pointer-sign
 .endfor
-.endif
-
-.include <bsd.lib.mk>
 
 # XXX
 COPTS.channels.c+=     -fno-strict-aliasing
+
+.include <bsd.lib.mk>
diff -r 80a47807c1c8 -r 54b047e69144 lib/libc/rpc/Makefile.inc
--- a/lib/libc/rpc/Makefile.inc Fri Aug 10 12:18:14 2012 +0000
+++ b/lib/libc/rpc/Makefile.inc Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.20 2011/07/04 12:05:00 manu Exp $
+#      $NetBSD: Makefile.inc,v 1.21 2012/08/10 12:20:10 joerg Exp $
 
 # librpc sources
 .PATH: ${.CURDIR}/rpc
@@ -169,6 +169,6 @@
                xdr.3 xdr_wrapstring.3
 
 # XXX
-.if ${HAVE_GCC} == 45 || ${MACHINE} == "vax"
+.if ${HAVE_GCC:U} == 45 || ${MACHINE} == "vax"
 COPTS.xdr_float.c+= -fno-strict-aliasing
 .endif
diff -r 80a47807c1c8 -r 54b047e69144 lib/libedit/Makefile
--- a/lib/libedit/Makefile      Fri Aug 10 12:18:14 2012 +0000
+++ b/lib/libedit/Makefile      Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.50 2012/03/21 05:37:42 matt Exp $
+#      $NetBSD: Makefile,v 1.51 2012/08/10 12:20:10 joerg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/4/93
 
 USE_SHLIBDIR=  yes
@@ -127,7 +127,7 @@
 .include <bsd.subdir.mk>
 
 # XXX
-.if ${HAVE_GCC} >= 45
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
 COPTS.editline.c+=     -Wno-cast-qual
 COPTS.tokenizer.c+=    -Wno-cast-qual
 COPTS.tokenizern.c+=   -Wno-cast-qual
diff -r 80a47807c1c8 -r 54b047e69144 lib/libtelnet/Makefile
--- a/lib/libtelnet/Makefile    Fri Aug 10 12:18:14 2012 +0000
+++ b/lib/libtelnet/Makefile    Fri Aug 10 12:20:10 2012 +0000
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      8.2 (Berkeley) 12/15/93
-#      $NetBSD: Makefile,v 1.35 2012/03/21 05:37:44 matt Exp $
+#      $NetBSD: Makefile,v 1.36 2012/08/10 12:20:10 joerg Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -31,10 +31,8 @@
 CPPFLAGS+= -DSRA
 .endif
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 .for f in auth enc_des kerberos5 pk
 COPTS.${f}.c+=  -Wno-pointer-sign
 .endfor
-.endif
 
 .include <bsd.lib.mk>
diff -r 80a47807c1c8 -r 54b047e69144 sbin/dump/Makefile
--- a/sbin/dump/Makefile        Fri Aug 10 12:18:14 2012 +0000
+++ b/sbin/dump/Makefile        Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.38 2012/04/07 04:52:20 christos Exp $
+#      $NetBSD: Makefile,v 1.39 2012/08/10 12:20:11 joerg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 #      dump.h                  header file
@@ -37,8 +37,6 @@
 
 .PATH:  ${NETBSDSRCDIR}/sys/ufs/ffs
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.ffs_inode.c+=    -Wno-pointer-sign
-.endif
 
 .include <bsd.prog.mk>
diff -r 80a47807c1c8 -r 54b047e69144 sbin/fsck_ffs/Makefile
--- a/sbin/fsck_ffs/Makefile    Fri Aug 10 12:18:14 2012 +0000
+++ b/sbin/fsck_ffs/Makefile    Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.43 2011/08/14 12:32:01 christos Exp $
+#      $NetBSD: Makefile,v 1.44 2012/08/10 12:20:11 joerg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/27/95
 
 .include <bsd.own.mk>
@@ -30,9 +30,7 @@
 LDADD+=-lprop
 DPADD+=${LIBPROP}
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 COPTS.ffs_appleufs.c+= -Wno-pointer-sign
-.endif
 
 .if ${MACHINE_ARCH} == "m68000"
 COPTS.pass1.c+=        -fno-tree-fre -fno-tree-lrs
diff -r 80a47807c1c8 -r 54b047e69144 sbin/fsdb/Makefile
--- a/sbin/fsdb/Makefile        Fri Aug 10 12:18:14 2012 +0000
+++ b/sbin/fsdb/Makefile        Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.33 2011/08/15 00:16:58 dholland Exp $
+#      $NetBSD: Makefile,v 1.34 2012/08/10 12:20:11 joerg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 .include <bsd.own.mk>
@@ -31,11 +31,9 @@
 DPADD+= ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} ${LIBPROP}
 .endif
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 .for f in fsdb ffs_appleufs
 COPTS.${f}.c+= -Wno-pointer-sign
 .endfor
-.endif
 
 .if ${MACHINE_ARCH} == "m68000"
 COPTS.pass1.c+=        -fno-tree-fre -fno-tree-lrs
diff -r 80a47807c1c8 -r 54b047e69144 sbin/mount_smbfs/Makefile.inc
--- a/sbin/mount_smbfs/Makefile.inc     Fri Aug 10 12:18:14 2012 +0000
+++ b/sbin/mount_smbfs/Makefile.inc     Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.4 2011/06/20 07:44:00 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2012/08/10 12:20:11 joerg Exp $
 #
 
 SRCS+= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
@@ -13,8 +13,6 @@
 DPADD+=${LIBUTIL}
 LDADD+=-lutil
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
 .for f in ctx mbuf nb_name nbns_rq
 COPTS.${f}.c+=       -Wno-pointer-sign
 .endfor
-.endif
diff -r 80a47807c1c8 -r 54b047e69144 sbin/newfs/Makefile
--- a/sbin/newfs/Makefile       Fri Aug 10 12:18:14 2012 +0000
+++ b/sbin/newfs/Makefile       Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.38 2011/06/20 07:44:00 mrg Exp $
+#      $NetBSD: Makefile,v 1.39 2012/08/10 12:20:11 joerg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 3/27/94
 
 .include <bsd.own.mk>
@@ -26,8 +26,6 @@
 LINKS= ${BINDIR}/newfs ${BINDIR}/mount_mfs
 MLINKS=        mount_mfs.8 mfs.8
 
-.include <bsd.prog.mk>
+COPTS.ffs_appleufs.c+= -Wno-pointer-sign
 
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
-COPTS.ffs_appleufs.c+= -Wno-pointer-sign
-.endif
+.include <bsd.prog.mk>
diff -r 80a47807c1c8 -r 54b047e69144 sbin/newfs_v7fs/Makefile
--- a/sbin/newfs_v7fs/Makefile  Fri Aug 10 12:18:14 2012 +0000
+++ b/sbin/newfs_v7fs/Makefile  Fri Aug 10 12:20:10 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/07/01 01:26:15 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2012/08/10 12:20:11 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -16,8 +16,6 @@
 CPPFLAGS+=-DV7FS_EI -I${V7FS} -I${FSCK} -g
 .PATH: ${V7FS} ${FSCK}
 
-.if defined(HAVE_GCC)
 COPTS.newfs_v7fs.c+=   -Wno-pointer-sign
-.endif
 
 .include <bsd.prog.mk>