From: Miod Vallat <miod@online.fr>
Subject: more explicit inter-library dependencies
To: tech@openbsd.org
Date: Tue, 8 Jul 2025 09:25:37 +0000

The following diff adds missing library dependencies in the Makefile for
a few binaries. This is needed, for example, to correctly build static
binaries.

Index: usr.bin/bgplg/bgplgsh/Makefile
===================================================================
RCS file: /OpenBSD/src/usr.bin/bgplg/bgplgsh/Makefile,v
diff -u -p -u -p -r1.3 Makefile
--- usr.bin/bgplg/bgplgsh/Makefile	3 Sep 2022 15:58:40 -0000	1.3
+++ usr.bin/bgplg/bgplgsh/Makefile	8 Jul 2025 09:22:40 -0000
@@ -11,8 +11,8 @@ CFLAGS+=	-Wshadow -Wpointer-arith -Wcast
 CFLAGS+=	-Wsign-compare
 CPPFLAGS+= 	-I${.CURDIR}
 CPPFLAGS+=	-I${.CURDIR}/../../lib/libedit
-LDADD=		-ledit
-DPADD+=		${LIBEDIT}
+LDADD=		-ledit -lcurses
+DPADD+=		${LIBEDIT} ${LIBCURSES}
 MAN=		bgplgsh.8
 
 BINDIR=		/usr/bin
Index: usr.bin/ssh/ssh-sk-helper/Makefile
===================================================================
RCS file: /OpenBSD/src/usr.bin/ssh/ssh-sk-helper/Makefile,v
diff -u -p -u -p -r1.5 Makefile
--- usr.bin/ssh/ssh-sk-helper/Makefile	13 Dec 2019 19:09:10 -0000	1.5
+++ usr.bin/ssh/ssh-sk-helper/Makefile	8 Jul 2025 09:22:40 -0000
@@ -13,8 +13,8 @@ MAN=	ssh-sk-helper.8
 
 .include <bsd.prog.mk>
 
-LDADD+= -lfido2 -lcbor -lusbhid
-DPADD+=	${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID}
+LDADD+= -lfido2 -lcbor -lusbhid -lz
+DPADD+=	${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBZ}
 
 LDADD+=	-lcrypto -lutil
 DPADD+=	${LIBCRYPTO} ${LIBUTIL}
Index: usr.bin/tcpbench/Makefile
===================================================================
RCS file: /OpenBSD/src/usr.bin/tcpbench/Makefile,v
diff -u -p -u -p -r1.11 Makefile
--- usr.bin/tcpbench/Makefile	5 Nov 2024 18:12:55 -0000	1.11
+++ usr.bin/tcpbench/Makefile	8 Jul 2025 09:22:40 -0000
@@ -1,7 +1,7 @@
 #	$OpenBSD: Makefile,v 1.11 2024/11/05 18:12:55 jan Exp $
 
 PROG=	tcpbench
-LDADD=	-lm -levent -ltls -lcrypto
-DPADD=	${LIBM} ${LIBEVENT} ${LIBTLS} ${LIBCRYPTO}
+LDADD=	-lm -levent -ltls -lssl -lcrypto
+DPADD=	${LIBM} ${LIBEVENT} ${LIBTLS} ${LIBSSL} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>