[src/trunk]: src/external/bsd/dhcp revert previous. Dynamic libraries break s...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d4403051f3bc
branches:  trunk
changeset: 810879:d4403051f3bc
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Sep 27 21:01:27 2015 +0000

description:
revert previous. Dynamic libraries break systems with split / and /usr
partitions and also sun2. libdns is pulling in Kerberos anyway.

diffstat:

 external/bsd/dhcp/Makefile.inc |  25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 4c793cdaa653 -r d4403051f3bc external/bsd/dhcp/Makefile.inc
--- a/external/bsd/dhcp/Makefile.inc    Sun Sep 27 13:02:21 2015 +0000
+++ b/external/bsd/dhcp/Makefile.inc    Sun Sep 27 21:01:27 2015 +0000
@@ -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+= -DLOCALSTATEDIR='"/var"'
 LDADD+= ${COBJDIR}/libdhcp.a
 LDADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
+.if defined(PROG) && ${PROG} == "dhclient"
+LDADD+=-Wl,-Bstatic
+.endif
+LDADD+= -lirs -lisccfg -ldns -lisc
+LDADD+=-lpthread
 .if (${MKCRYPTO} != "no")
-LDADD+= -lcrypto -lcrypt
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
+.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
-LDADD+=-lirs -lisccfg -ldns -lisc
-LDADD+=-lpthread
+.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}