Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcp Add a build kludge to make dhclient link s...



details:   https://anonhg.NetBSD.org/src/rev/11b1ee60e981
branches:  trunk
changeset: 785682:11b1ee60e981
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 24 22:21:21 2013 +0000

description:
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.

diffstat:

 external/bsd/dhcp/Makefile.inc |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 665a396db6b9 -r 11b1ee60e981 external/bsd/dhcp/Makefile.inc
--- a/external/bsd/dhcp/Makefile.inc    Sun Mar 24 22:06:37 2013 +0000
+++ b/external/bsd/dhcp/Makefile.inc    Sun Mar 24 22:21:21 2013 +0000
@@ -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+= -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}



Home | Main Index | Thread Index | Old Index