Module Name: src
Committed By: joerg
Date: Fri Aug 10 12:20:12 UTC 2012
Modified Files:
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/lib: Makefile
src/lib/libc/rpc: Makefile.inc
src/lib/libedit: Makefile
src/lib/libtelnet: Makefile
src/sbin/dump: Makefile
src/sbin/fsck_ffs: Makefile
src/sbin/fsdb: Makefile
src/sbin/mount_smbfs: Makefile.inc
src/sbin/newfs: Makefile
src/sbin/newfs_v7fs: Makefile
Log Message:
Don't depend on HAVE_GCC being always defined.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/rpc/Makefile.inc
cvs rdiff -u -r1.50 -r1.51 src/lib/libedit/Makefile
cvs rdiff -u -r1.35 -r1.36 src/lib/libtelnet/Makefile
cvs rdiff -u -r1.38 -r1.39 src/sbin/dump/Makefile
cvs rdiff -u -r1.43 -r1.44 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sbin/mount_smbfs/Makefile.inc
cvs rdiff -u -r1.38 -r1.39 src/sbin/newfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/newfs_v7fs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.4 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.5
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.4 Mon Jun 20 07:43:56 2011
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Fri Aug 10 12:20:11 2012
@@ -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>
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.7 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.8
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.7 Wed Aug 17 05:32:09 2011
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Fri Aug 10 12:20:12 2012
@@ -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 ssht
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
Index: src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.3 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.4
--- src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.3 Mon Jun 20 07:43:56 2011
+++ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile Fri Aug 10 12:20:12 2012
@@ -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>
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.8 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.9
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.8 Wed Sep 7 17:49:19 2011
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Fri Aug 10 12:20:12 2012
@@ -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
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")
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.10 src/crypto/external/bsd/openssh/lib/Makefile:1.11
--- src/crypto/external/bsd/openssh/lib/Makefile:1.10 Mon Jul 25 03:03:33 2011
+++ src/crypto/external/bsd/openssh/lib/Makefile Fri Aug 10 12:20:12 2012
@@ -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}/crypt
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>
Index: src/lib/libc/rpc/Makefile.inc
diff -u src/lib/libc/rpc/Makefile.inc:1.20 src/lib/libc/rpc/Makefile.inc:1.21
--- src/lib/libc/rpc/Makefile.inc:1.20 Mon Jul 4 12:05:00 2011
+++ src/lib/libc/rpc/Makefile.inc Fri Aug 10 12:20:10 2012
@@ -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.
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
Index: src/lib/libedit/Makefile
diff -u src/lib/libedit/Makefile:1.50 src/lib/libedit/Makefile:1.51
--- src/lib/libedit/Makefile:1.50 Wed Mar 21 05:37:42 2012
+++ src/lib/libedit/Makefile Fri Aug 10 12:20:10 2012
@@ -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
Index: src/lib/libtelnet/Makefile
diff -u src/lib/libtelnet/Makefile:1.35 src/lib/libtelnet/Makefile:1.36
--- src/lib/libtelnet/Makefile:1.35 Wed Mar 21 05:37:44 2012
+++ src/lib/libtelnet/Makefile Fri Aug 10 12:20:10 2012
@@ -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>
Index: src/sbin/dump/Makefile
diff -u src/sbin/dump/Makefile:1.38 src/sbin/dump/Makefile:1.39
--- src/sbin/dump/Makefile:1.38 Sat Apr 7 04:52:20 2012
+++ src/sbin/dump/Makefile Fri Aug 10 12:20:11 2012
@@ -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>
Index: src/sbin/fsck_ffs/Makefile
diff -u src/sbin/fsck_ffs/Makefile:1.43 src/sbin/fsck_ffs/Makefile:1.44
--- src/sbin/fsck_ffs/Makefile:1.43 Sun Aug 14 12:32:01 2011
+++ src/sbin/fsck_ffs/Makefile Fri Aug 10 12:20:11 2012
@@ -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
Index: src/sbin/fsdb/Makefile
diff -u src/sbin/fsdb/Makefile:1.33 src/sbin/fsdb/Makefile:1.34
--- src/sbin/fsdb/Makefile:1.33 Mon Aug 15 00:16:58 2011
+++ src/sbin/fsdb/Makefile Fri Aug 10 12:20:11 2012
@@ -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
Index: src/sbin/mount_smbfs/Makefile.inc
diff -u src/sbin/mount_smbfs/Makefile.inc:1.4 src/sbin/mount_smbfs/Makefile.inc:1.5
--- src/sbin/mount_smbfs/Makefile.inc:1.4 Mon Jun 20 07:44:00 2011
+++ src/sbin/mount_smbfs/Makefile.inc Fri Aug 10 12:20:11 2012
@@ -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${SMBD
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
Index: src/sbin/newfs/Makefile
diff -u src/sbin/newfs/Makefile:1.38 src/sbin/newfs/Makefile:1.39
--- src/sbin/newfs/Makefile:1.38 Mon Jun 20 07:44:00 2011
+++ src/sbin/newfs/Makefile Fri Aug 10 12:20:11 2012
@@ -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>
Index: src/sbin/newfs_v7fs/Makefile
diff -u src/sbin/newfs_v7fs/Makefile:1.2 src/sbin/newfs_v7fs/Makefile:1.3
--- src/sbin/newfs_v7fs/Makefile:1.2 Fri Jul 1 01:26:15 2011
+++ src/sbin/newfs_v7fs/Makefile Fri Aug 10 12:20:11 2012
@@ -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>
