diff options
| author | joerg <joerg@NetBSD.org> | 2012-08-10 12:20:10 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2012-08-10 12:20:10 +0000 |
| commit | 796ae57f296eac4b2c98c8a03e04eef040e37188 (patch) | |
| tree | 956feb424081e4b1aaa3eea61afabb8049291f1d | |
| parent | e51e1c237afbdd9034c7fff839636761d3957dc7 (diff) | |
Don't depend on HAVE_GCC being always defined.
| -rw-r--r-- | crypto/external/bsd/openssh/bin/sftp/Makefile | 8 | ||||
| -rw-r--r-- | crypto/external/bsd/openssh/bin/ssh-keygen/Makefile | 8 | ||||
| -rw-r--r-- | crypto/external/bsd/openssh/bin/ssh/Makefile | 4 | ||||
| -rw-r--r-- | crypto/external/bsd/openssh/bin/sshd/Makefile | 4 | ||||
| -rw-r--r-- | crypto/external/bsd/openssh/lib/Makefile | 8 | ||||
| -rw-r--r-- | lib/libc/rpc/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libedit/Makefile | 4 | ||||
| -rw-r--r-- | lib/libtelnet/Makefile | 4 | ||||
| -rw-r--r-- | sbin/dump/Makefile | 4 | ||||
| -rw-r--r-- | sbin/fsck_ffs/Makefile | 4 | ||||
| -rw-r--r-- | sbin/fsdb/Makefile | 4 | ||||
| -rw-r--r-- | sbin/mount_smbfs/Makefile.inc | 4 | ||||
| -rw-r--r-- | sbin/newfs/Makefile | 8 | ||||
| -rw-r--r-- | sbin/newfs_v7fs/Makefile | 4 |
14 files changed, 24 insertions, 48 deletions
diff --git a/crypto/external/bsd/openssh/bin/sftp/Makefile b/crypto/external/bsd/openssh/bin/sftp/Makefile index 192d19cd91b..b502c1bcbcc 100644 --- a/crypto/external/bsd/openssh/bin/sftp/Makefile +++ b/crypto/external/bsd/openssh/bin/sftp/Makefile @@ -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 @@ MAN= sftp.1 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 --git a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile index e866d23bc36..1b0e22be342 100644 --- a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile +++ b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile @@ -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> - -.if defined(HAVE_GCC) || defined(HAVE_PCC) COPTS.ssh-keygen.c= -Wno-pointer-sign -.endif + +.include <bsd.prog.mk> diff --git a/crypto/external/bsd/openssh/bin/ssh/Makefile b/crypto/external/bsd/openssh/bin/ssh/Makefile index ea0f8793965..21d81ed052d 100644 --- a/crypto/external/bsd/openssh/bin/ssh/Makefile +++ b/crypto/external/bsd/openssh/bin/ssh/Makefile @@ -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 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ 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 --git a/crypto/external/bsd/openssh/bin/sshd/Makefile b/crypto/external/bsd/openssh/bin/sshd/Makefile index 3d35a24d3ef..92c7f52ed0a 100644 --- a/crypto/external/bsd/openssh/bin/sshd/Makefile +++ b/crypto/external/bsd/openssh/bin/sshd/Makefile @@ -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 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ 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 --git a/crypto/external/bsd/openssh/lib/Makefile b/crypto/external/bsd/openssh/lib/Makefile index 8c1f90b1783..8640f28f2db 100644 --- a/crypto/external/bsd/openssh/lib/Makefile +++ b/crypto/external/bsd/openssh/lib/Makefile @@ -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 @@ LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \ 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 --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index 673cfbfde96..4648a78f92b 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -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 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \ 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 --git a/lib/libedit/Makefile b/lib/libedit/Makefile index 4014261faf9..0880363d11e 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -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 @@ tc1: libedit.a tc1.o .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 --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 707b6f8ee6b..fde8b8dc08a 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -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 @@ SRCS+= sra.c pk.c 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 --git a/sbin/dump/Makefile b/sbin/dump/Makefile index 911eb3446f9..11de7316008 100644 --- a/sbin/dump/Makefile +++ b/sbin/dump/Makefile @@ -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 @@ LDADD+= -lutil .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 --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile index 0722032cc6c..651355783cc 100644 --- a/sbin/fsck_ffs/Makefile +++ b/sbin/fsck_ffs/Makefile @@ -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 @@ DPADD+=${LIBUTIL} 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 --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index 8b56fad7ed4..7f0a0514816 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -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 @@ LDADD+= -lutil -ledit -lterminfo -lprop 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 --git a/sbin/mount_smbfs/Makefile.inc b/sbin/mount_smbfs/Makefile.inc index 290b7cb520b..461088cc736 100644 --- a/sbin/mount_smbfs/Makefile.inc +++ b/sbin/mount_smbfs/Makefile.inc @@ -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 @@ CPPFLAGS+= -I${SMBDIST}/include -I${SMBDIST}/mount_smbfs 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 --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile index 03ee77db89e..b0ebb518eea 100644 --- a/sbin/newfs/Makefile +++ b/sbin/newfs/Makefile @@ -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 @@ DPADD+=${LIBPROP} LINKS= ${BINDIR}/newfs ${BINDIR}/mount_mfs MLINKS= mount_mfs.8 mfs.8 -.include <bsd.prog.mk> - -.if defined(HAVE_GCC) || defined(HAVE_PCC) COPTS.ffs_appleufs.c+= -Wno-pointer-sign -.endif + +.include <bsd.prog.mk> diff --git a/sbin/newfs_v7fs/Makefile b/sbin/newfs_v7fs/Makefile index 21ce304a332..7fea12317be 100644 --- a/sbin/newfs_v7fs/Makefile +++ b/sbin/newfs_v7fs/Makefile @@ -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 @@ LDADD+= -lutil 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> |
