Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Only compile in IPv6 support if ${USE_INET6} != "no"
details: https://anonhg.NetBSD.org/src/rev/583e2baf1dc3
branches: trunk
changeset: 572674:583e2baf1dc3
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Jan 10 02:58:58 2005 +0000
description:
Only compile in IPv6 support if ${USE_INET6} != "no"
MKINET6 is for providing IPv6 infrastructure.
USE_INET6 is for compiling IPv6 support into the programs (needs MKINET6).
diffstat:
gnu/usr.sbin/sendmail/Makefile.inc | 8 +++++-
lib/libc/net/Makefile.inc | 5 +--
lib/libipsec/Makefile | 10 +++++++-
lib/libpcap/Makefile | 7 ++++-
lib/libresolv/Makefile | 5 +++-
lib/libwrap/Makefile.cflags | 5 ++-
libexec/fingerd/Makefile | 6 ++++-
libexec/ftpd/Makefile | 5 ++-
libexec/rlogind/Makefile | 10 +++++++-
libexec/rshd/Makefile | 6 ++++-
regress/lib/libutil/sockaddr_snprintf/Makefile | 11 ++++++++-
regress/lib/libutil/sockaddr_snprintf/sockaddr_snprintf.c | 6 ++++-
rescue/Makefile | 6 ++++-
rescue/list | 4 +--
rescue/list.inet6 | 4 +++
sbin/ifconfig/Makefile | 6 ++++-
sbin/mount_nfs/Makefile | 8 +++++-
sbin/route/Makefile | 6 ++++-
share/mk/bsd.x11.mk | 8 +++++-
usr.bin/finger/Makefile | 8 +++++-
usr.bin/fstat/Makefile | 7 +++++-
usr.bin/ftp/Makefile | 6 +++-
usr.bin/netstat/Makefile | 8 +++++-
usr.bin/rpcinfo/Makefile | 8 +++++-
usr.bin/systat/Makefile | 11 +++++++--
usr.bin/telnet/Makefile | 4 ++-
usr.sbin/altq/libaltq/Makefile | 10 +++++++-
usr.sbin/inetd/Makefile | 10 +++++++-
usr.sbin/ipf/Makefile.inc | 6 ++++-
usr.sbin/lpr/lpd/Makefile | 4 ++-
usr.sbin/pppd/pppd/Makefile | 5 +++-
usr.sbin/pvcsif/Makefile | 7 +++++-
usr.sbin/pvctxctl/Makefile | 7 +++++-
usr.sbin/racoon/libpfkey/Makefile | 8 +++++-
usr.sbin/racoon/racoon/Makefile | 8 +++++-
usr.sbin/rpcbind/Makefile | 5 ++-
usr.sbin/syslogd/Makefile | 7 ++++-
usr.sbin/tcpdump/Makefile | 16 +++++++++-----
usr.sbin/trpt/Makefile | 6 ++++-
39 files changed, 209 insertions(+), 68 deletions(-)
diffs (truncated from 869 to 300 lines):
diff -r 3f7e33b87a08 -r 583e2baf1dc3 gnu/usr.sbin/sendmail/Makefile.inc
--- a/gnu/usr.sbin/sendmail/Makefile.inc Mon Jan 10 02:53:39 2005 +0000
+++ b/gnu/usr.sbin/sendmail/Makefile.inc Mon Jan 10 02:58:58 2005 +0000
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile.inc,v 1.8 2003/07/04 04:52:59 atatat Exp $
+# $NetBSD: Makefile.inc,v 1.9 2005/01/10 02:58:58 lukem Exp $
WARNS?= 0
CPPFLAGS+= -DNEWDB -DDNSMAP -DIP_SRCROUTE
CPPFLAGS+= -DMAP_REGEX -DTCPWRAPPERS -DNETISO
-CPPFLAGS+= -DNEEDSGETIPNODE -DNETINET6
+CPPFLAGS+= -DNEEDSGETIPNODE
CPPFLAGS+= -DMILTER
CPPFLAGS+= -I. -I${.CURDIR}/../include \
-I${DIST}/sendmail/sendmail -I${DIST}/sendmail/include
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DNETINET6
+.endif
+
.if (${USE_YP} != "no")
CPPFLAGS+= -DNIS
.endif
diff -r 3f7e33b87a08 -r 583e2baf1dc3 lib/libc/net/Makefile.inc
--- a/lib/libc/net/Makefile.inc Mon Jan 10 02:53:39 2005 +0000
+++ b/lib/libc/net/Makefile.inc Mon Jan 10 02:58:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.66 2004/12/20 18:30:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.67 2005/01/10 02:58:58 lukem Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources
@@ -19,9 +19,8 @@
SRCS+= hesiod.c
.endif
-# IPv6
SRCS+= getaddrinfo.c getnameinfo.c
-.if (${MKINET6} != "no")
+.if (${USE_INET6} != "no")
SRCS+= ip6opt.c rthdr.c vars6.c
.endif
SRCS+= if_indextoname.c if_nameindex.c if_nametoindex.c
diff -r 3f7e33b87a08 -r 583e2baf1dc3 lib/libipsec/Makefile
--- a/lib/libipsec/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/lib/libipsec/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,10 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2002/08/19 14:55:15 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/10 02:58:58 lukem Exp $
USE_SHLIBDIR= yes
+.include <bsd.own.mk>
+
LIB= ipsec
CFLAGS+=-g
-CPPFLAGS+=-DIPSEC_DEBUG -DIPSEC -DINET6 -I${.CURDIR} -I. -DYY_NO_UNPUT
+CPPFLAGS+=-DIPSEC_DEBUG -DIPSEC -I${.CURDIR} -I. -DYY_NO_UNPUT
+
+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DINET6
+.endif
SRCS+= ipsec_strerror.c policy_parse.y policy_token.l
SRCS+= ipsec_get_policylen.c ipsec_dump_policy.c
diff -r 3f7e33b87a08 -r 583e2baf1dc3 lib/libpcap/Makefile
--- a/lib/libpcap/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/lib/libpcap/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/09/27 23:02:53 dyoung Exp $
+# $NetBSD: Makefile,v 1.27 2005/01/10 02:58:58 lukem Exp $
.include <bsd.own.mk>
@@ -8,7 +8,6 @@
WARNS?= 1
CPPFLAGS+=-I. -I${.CURDIR} -I${NETBSDSRCDIR}/sys/dist/pf -DYYBISON
-CPPFLAGS+=-DINET6
CPPFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_IOCCOM_H=1 -DHAVE_SYS_SOCKIO_H=1
CPPFLAGS+=-DHAVE_NETINET_IF_ETHER_H
CPPFLAGS+=-DHAVE_ETHER_HOSTTON=1 -DHAVE_STRERROR=1 -DHAVE_SOCKADDR_SA_LEN=1
@@ -20,6 +19,10 @@
YPREFIX=pcap_
YHEADER=1
+.if (${USE_INET6} != "no")
+CPPFLAGS+=-DINET6
+.endif
+
SRCS= scanner.l savefile.c pcap.c pcap-bpf.c optimize.c nametoaddr.c \
inet.c grammar.y gencode.c fad-getad.c etherent.c bpf_image.c \
bpf_dump.c
diff -r 3f7e33b87a08 -r 583e2baf1dc3 lib/libresolv/Makefile
--- a/lib/libresolv/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/lib/libresolv/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2004/05/21 03:33:44 christos Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/10 02:58:58 lukem Exp $
# from: @(#)Makefile 5.1 (Berkeley) 6/5/90
.include <bsd.own.mk>
LIB=resolv
CPPFLAGS+=-DLIBC_SCCS -I${NETBSDSRCDIR}/lib/libc/include -D_LIBC
+
+.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
+.endif
.PATH: ${NETBSDSRCDIR}/lib/libc/net ${NETBSDSRCDIR}/lib/libc/resolv
diff -r 3f7e33b87a08 -r 583e2baf1dc3 lib/libwrap/Makefile.cflags
--- a/lib/libwrap/Makefile.cflags Mon Jan 10 02:53:39 2005 +0000
+++ b/lib/libwrap/Makefile.cflags Mon Jan 10 02:58:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cflags,v 1.7 2002/05/24 05:38:20 itojun Exp $
+# $NetBSD: Makefile.cflags,v 1.8 2005/01/10 02:58:58 lukem Exp $
.include <bsd.own.mk>
@@ -18,5 +18,6 @@
# tcpdmatch) that include this file.
#CPPFLAGS+=-DPARANOID
-# IPv6
+.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
+.endif
diff -r 3f7e33b87a08 -r 583e2baf1dc3 libexec/fingerd/Makefile
--- a/libexec/fingerd/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/libexec/fingerd/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.8 1999/07/02 06:00:06 itojun Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/10 02:58:58 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
+.include <bsd.own.mk>
+
PROG= fingerd
MAN= fingerd.8
+.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
+.endif
.include <bsd.prog.mk>
diff -r 3f7e33b87a08 -r 583e2baf1dc3 libexec/ftpd/Makefile
--- a/libexec/ftpd/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/libexec/ftpd/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2003/07/23 08:01:27 itojun Exp $
+# $NetBSD: Makefile,v 1.52 2005/01/10 02:58:58 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
.include <bsd.own.mk>
@@ -15,8 +15,9 @@
SRCS+= ls.c cmp.c print.c stat_flags.c util.c
.PATH: ${NETBSDSRCDIR}/bin/ls
+.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
-.include <bsd.own.mk>
+.endif
WARNS=2
diff -r 3f7e33b87a08 -r 583e2baf1dc3 libexec/rlogind/Makefile
--- a/libexec/rlogind/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/libexec/rlogind/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,12 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2004/11/15 20:45:52 christos Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/10 02:58:58 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
+.include <bsd.own.mk>
+
WARNS= 3
PROG= rlogind
MAN= rlogind.8
DPADD= ${LIBUTIL}
LDADD= -lutil
-CPPFLAGS+= -DINET6 -DSUPPORT_UTMP -DSUPPORT_UTMPX
+CPPFLAGS+= -DSUPPORT_UTMP -DSUPPORT_UTMPX
+
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DINET6
+.endif
.include <bsd.prog.mk>
diff -r 3f7e33b87a08 -r 583e2baf1dc3 libexec/rshd/Makefile
--- a/libexec/rshd/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/libexec/rshd/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/11/30 21:56:34 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2005/01/10 02:58:58 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
+.include <bsd.own.mk>
+
PROG= rshd
MAN= rshd.8
@@ -9,6 +11,8 @@
CPPFLAGS+=-DLOGIN_CAP
+.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
+.endif
.include <bsd.prog.mk>
diff -r 3f7e33b87a08 -r 583e2baf1dc3 regress/lib/libutil/sockaddr_snprintf/Makefile
--- a/regress/lib/libutil/sockaddr_snprintf/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/regress/lib/libutil/sockaddr_snprintf/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,7 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2004/11/19 21:38:25 christos Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/10 02:58:58 lukem Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
PROG= sockaddr_snprintf
-NOMAN= # defined
+
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DINET6
+.endif
regress: ${PROG}
./${PROG}
diff -r 3f7e33b87a08 -r 583e2baf1dc3 regress/lib/libutil/sockaddr_snprintf/sockaddr_snprintf.c
--- a/regress/lib/libutil/sockaddr_snprintf/sockaddr_snprintf.c Mon Jan 10 02:53:39 2005 +0000
+++ b/regress/lib/libutil/sockaddr_snprintf/sockaddr_snprintf.c Mon Jan 10 02:58:58 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sockaddr_snprintf.c,v 1.1 2004/11/19 21:38:25 christos Exp $ */
+/* $NetBSD: sockaddr_snprintf.c,v 1.2 2005/01/10 02:58:58 lukem Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -67,6 +67,7 @@
errx(1, "res='%s' != '%s'", buf, res);
}
+#ifdef INET6
static void
in6(void)
{
@@ -87,6 +88,7 @@
if (strcmp(res = "24 28 80 ff01::1", buf) != 0)
errx(1, "res='%s' != '%s'", buf, res);
}
+#endif /* INET6 */
static void
un(void)
@@ -158,7 +160,9 @@
main(int argc, char *argv[])
{
in();
+#ifdef INET6
in6();
+#endif
un();
at();
dl();
diff -r 3f7e33b87a08 -r 583e2baf1dc3 rescue/Makefile
--- a/rescue/Makefile Mon Jan 10 02:53:39 2005 +0000
+++ b/rescue/Makefile Mon Jan 10 02:58:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/08/20 11:01:03 tron Exp $
+# $NetBSD: Makefile,v 1.12 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,6 +22,10 @@
.endif
.endfor
+.if ${USE_INET6} != "no"
+LISTS+= lists.inet6
+.endif
+
.if (${OBJECT_FMT} == "ELF")
PARSELISTENV+= LDD_CMD=ldd_elf
.else
diff -r 3f7e33b87a08 -r 583e2baf1dc3 rescue/list
--- a/rescue/list Mon Jan 10 02:53:39 2005 +0000
+++ b/rescue/list Mon Jan 10 02:58:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.12 2004/08/20 11:01:03 tron Exp $
+# $NetBSD: list,v 1.13 2005/01/10 02:58:59 lukem Exp $
SRCDIRS bin
@@ -89,7 +89,6 @@
PROG newfs_lfs
Home |
Main Index |
Thread Index |
Old Index