Module Name: src Committed By: snj Date: Sat Oct 11 16:22:28 UTC 2014
Modified Files: src/external/bsd/dhcp [netbsd-7]: Makefile.inc Log Message: Pull up following revision(s) (requested by christos in ticket #133): external/bsd/dhcp/Makefile.inc: revision 1.12 The crypto-enabled dhclient command needs more libraries burned in so that it does not depend on /usr/lib To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.2.1 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.11 src/external/bsd/dhcp/Makefile.inc:1.11.2.1 --- src/external/bsd/dhcp/Makefile.inc:1.11 Sat Jul 12 12:11:22 2014 +++ src/external/bsd/dhcp/Makefile.inc Sat Oct 11 16:22:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.11 2014/07/12 12:11:22 spz Exp $ +# $NetBSD: Makefile.inc,v 1.11.2.1 2014/10/11 16:22:28 snj Exp $ WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare @@ -36,9 +36,6 @@ LDADD+=-Wl,-Bstatic .endif LDADD+= -lirs -lisccfg -ldns -lisc LDADD+=-lpthread -.if defined(PROG) && ${PROG} == "dhclient" -LDADD+=-Wl,-Bdynamic -.endif .if (${MKCRYPTO} != "no") .if (${MKKERBEROS} != "no") LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \ @@ -46,6 +43,9 @@ LDADD+= -lgssapi -lkrb5 -lhx509 -lheimnt 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