Module Name: src
Committed By: roy
Date: Sat Aug 4 19:11:39 UTC 2012
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Workaround libc not exporting in6addr_any when built with MKINET6=no.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.12 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.13
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.12 Thu Jul 12 16:54:14 2012
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Sat Aug 4 19:11:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/07/12 16:54:14 roy Exp $
+# $NetBSD: Makefile,v 1.13 2012/08/04 19:11:39 roy Exp $
#
PROG= dhcpcd
@@ -11,10 +11,17 @@ SRCS+= bpf.c if-bsd.c platform-bsd.c
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist
-.PATH: ${DIST}
-
CPPFLAGS+= -I${DIST}
+# Workaround libc not exporting in6addr_any when MKINET6=no
+.if defined(MKINET6) && empty(MKINET6:M[yY][eE][sS])
+LIBC_NET= ${NETBSDSRCDIR}/lib/libc/net
+SRCS+= vars6.c
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libc/include
+.endif
+
+.PATH: ${DIST} ${LIBC_NET}
+
SCRIPTS= dhcpcd-run-hooks
SCRIPTSDIR_dhcpcd-run-hooks= /libexec
