Module Name: src
Committed By: christos
Date: Sun Mar 24 22:21:22 UTC 2013
Modified Files:
src/external/bsd/dhcp: Makefile.inc
Log Message:
Add a build kludge to make dhclient link statically libisc, libdns, libpthread
so it does not need things from /usr/lib, until we decide what to do with it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/dhcp/Makefile.inc
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/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.1 src/external/bsd/dhcp/Makefile.inc:1.2
--- src/external/bsd/dhcp/Makefile.inc:1.1 Sun Mar 24 11:54:29 2013
+++ src/external/bsd/dhcp/Makefile.inc Sun Mar 24 18:21:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/03/24 15:54:29 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/03/24 22:21:21 christos Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -31,9 +31,17 @@ CPPFLAGS+= -I${BIND}/lib/${dir}/pthreads
CPPFLAGS+= -DLOCALSTATEDIR='"/var"'
LDADD+= ${COBJDIR}/libdhcp.a
LDADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
+.if defined(PROG) && ${PROG} == "dhclient"
+LDADD+=--static
+.endif
LDADD+= -ldns -lisc
-LDADD+= -lipsec
+LDADD+=-lpthread
+.if defined(PROG) && ${PROG} == "dhclient"
+LDADD+=--dynamic
+.endif
+LDADD+= -lcrypto -lipsec
DPADD+= ${COBJDIR}/libdhcp.a
DPADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
DPADD+= ${LIBDNS} ${LIBISC}
-DPADD+= ${LIBIPSEC}
+DPADD+= ${LIBCRYPTO} ${LIBIPSEC}
+DPADD+= ${LIBPTHREAD}
