Module Name: src Committed By: mlelstv Date: Sun Sep 27 21:01:27 UTC 2015
Modified Files: src/external/bsd/dhcp: Makefile.inc Log Message: revert previous. Dynamic libraries break systems with split / and /usr partitions and also sun2. libdns is pulling in Kerberos anyway. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 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.14 src/external/bsd/dhcp/Makefile.inc:1.15 --- src/external/bsd/dhcp/Makefile.inc:1.14 Sat Sep 26 09:48:27 2015 +++ src/external/bsd/dhcp/Makefile.inc Sun Sep 27 21:01:27 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.14 2015/09/26 09:48:27 mlelstv Exp $ +# $NetBSD: Makefile.inc,v 1.15 2015/09/27 21:01:27 mlelstv Exp $ WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare @@ -31,12 +31,27 @@ CPPFLAGS+= -I${BIND}/lib/${dir}/pthreads CPPFLAGS+= -DLOCALSTATEDIR='"/var"' LDADD+= ${COBJDIR}/libdhcp.a LDADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a -.if (${MKCRYPTO} != "no") -LDADD+= -lcrypto -lcrypt -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} +.if defined(PROG) && ${PROG} == "dhclient" +LDADD+=-Wl,-Bstatic .endif -LDADD+=-lirs -lisccfg -ldns -lisc +LDADD+= -lirs -lisccfg -ldns -lisc LDADD+=-lpthread +.if (${MKCRYPTO} != "no") +.if (${MKKERBEROS} != "no") +LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \ + -lcom_err -lroken -lasn1 -lwind +DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \ + ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND} +.endif +.if defined(PROG) && ${PROG} == "dhclient" +LDADD+=-Wl,-Bdynamic +.endif +LDADD+= -lcrypto -lipsec -lcrypt +DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT} +.endif +.if defined(PROG) && ${PROG} == "dhclient" +LDADD+=-Wl,-Bdynamic +.endif DPADD+= ${COBJDIR}/libdhcp.a DPADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a DPADD+= ${LIBDNS} ${LIBISC}