Module Name:    src
Committed By:   christos
Date:           Mon Feb 19 20:39:13 UTC 2024

Modified Files:

Log Message:
fix static build

To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mpl/dhcp/

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mpl/dhcp/
diff -u src/external/mpl/dhcp/ src/external/mpl/dhcp/
--- src/external/mpl/dhcp/	Sun Feb 18 15:57:30 2024
+++ src/external/mpl/dhcp/	Mon Feb 19 15:39:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD:,v 1.12 2024/02/18 20:57:30 christos Exp $
+# $NetBSD:,v 1.13 2024/02/19 20:39:13 christos Exp $
 WARNS?=	1	# XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -14,9 +14,6 @@ BIND:=	${.PARSEDIR}/bind
-COBJDIR!=cd ${.PARSEDIR}/lib/common && ${PRINTOBJDIR}
-OMOBJDIR!=cd ${.PARSEDIR}/lib/omapip && ${PRINTOBJDIR}
 .if (${USE_INET6} != "no")
@@ -29,8 +26,6 @@ CPPFLAGS+= -I${BINDDIST}/lib/${dir}/unix
 CPPFLAGS+= -I${BINDDIST}/lib/${dir}/pthreads/include
-LDADD+= ${COBJDIR}/libdhcp.a
-LDADD+= ${OMOBJDIR}/libomapi.a
 .if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
 # We link the libraries that are in /usr/lib and not in /lib statically
 # because dhclient is in /sbin and is needed before /usr is mounted in
@@ -38,26 +33,28 @@ LDADD+= ${OMOBJDIR}/libomapi.a
 # would be to install the libraries in /lib...
+PROGDPLIBS+= dhcp ${DIST}/../lib/common
+PROGDPLIBS+= omapi ${DIST}/../lib/omapip
 PROGDPLIBS+= irs ${BIND}/lib/libirs
 PROGDPLIBS+= isccfg ${BIND}/lib/libisccfg
 PROGDPLIBS+= dns ${BIND}/lib/libdns
 PROGDPLIBS+= isc ${BIND}/lib/libisc
 PROGDPLIBS+= uv ${NETBSDSRCDIR}/external/mit/libuv/lib
-LDADD+= -lexecinfo -lkvm -lpthread -lz
+PROGDPLIBS+= execinfo ${NETBSDSRCDIR}/lib/libexecinfo
+PROGDPLIBS+= kvm ${NETBSDSRCDIR}/lib/libkvm
+PROGDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
 .if (${MKKERBEROS} != "no")
-LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
 .if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
-LDADD+= -lssl -lcrypto -lipsec -lcrypt
+LDADD_AFTER+= -lssl -lcrypto -lipsec -lcrypt
 .if defined(PROG) && ${PROG} == "dhclient" && ${MKSANITIZER:Uno} != "yes"
-DPADD+= ${COBJDIR}/libdhcp.a
-DPADD+= ${OMOBJDIR}/libomapi.a
 COPTS+=	-fcommon

Reply via email to