The branch stable/15 has been updated by des:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b7362fcfad5bf248cd6936db25d5d72747a29662

commit b7362fcfad5bf248cd6936db25d5d72747a29662
Author:     Dag-Erling Smørgrav <[email protected]>
AuthorDate: 2026-02-28 18:11:10 +0000
Commit:     Dag-Erling Smørgrav <[email protected]>
CommitDate: 2026-03-05 08:06:04 +0000

    libiscsiutil: Record dependency on libmd
    
    MFC after:      3 days
    Fixes:          6378393308bc ("Add an internal libiscsiutil library.")
    Sponsored by:   Klara, Inc.
    Sponsored by:   NetApp, Inc.
    Reviewed by:    kevans
    Differential Revision:  https://reviews.freebsd.org/D55596
    
    (cherry picked from commit 05ca4837a3e9a413aabcf005abb14fff35088476)
---
 lib/libiscsiutil/Makefile | 2 +-
 share/mk/src.libnames.mk  | 1 +
 usr.sbin/ctld/Makefile    | 2 +-
 usr.sbin/iscsid/Makefile  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/libiscsiutil/Makefile b/lib/libiscsiutil/Makefile
index d9762302fd40..d34ffd83aaed 100644
--- a/lib/libiscsiutil/Makefile
+++ b/lib/libiscsiutil/Makefile
@@ -2,8 +2,8 @@ LIB=            iscsiutil
 INTERNALLIB=
 
 INCS=          libiscsiutil.h
-
 SRCS=          chap.c connection.c keys.c log.c pdu.c text.c utils.c
 CFLAGS+=       -I${SRCTOP}/sys/dev/iscsi
+LIBADD=                md
 
 .include <bsd.lib.mk>
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 00dd8b9e5d4d..945df60769fc 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -505,6 +505,7 @@ _DP_netmap=
 _DP_ifconfig=  m
 _DP_pfctl=     nv
 _DP_krb5ss=            edit
+_DP_iscsiutil= md
 
 # OFED support
 .if ${MK_OFED} != "no"
diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile
index 61efe8a05cfb..097e6c6f89b1 100644
--- a/usr.sbin/ctld/Makefile
+++ b/usr.sbin/ctld/Makefile
@@ -20,7 +20,7 @@ NO_WCAST_ALIGN=
 CXXWARNFLAGS.gcc= -Wno-shadow
 MAN=           ctld.8 ctl.conf.5
 
-LIBADD=                bsdxml iscsiutil nvmf md sbuf util ucl m nv util++
+LIBADD=                bsdxml iscsiutil nvmf sbuf util ucl m nv util++
 
 YFLAGS+=       -v
 CLEANFILES=    y.tab.c y.tab.h y.output
diff --git a/usr.sbin/iscsid/Makefile b/usr.sbin/iscsid/Makefile
index 4403e796f89d..650096d137e7 100644
--- a/usr.sbin/iscsid/Makefile
+++ b/usr.sbin/iscsid/Makefile
@@ -8,6 +8,6 @@ CFLAGS+=        -I${SRCTOP}/lib/libiscsiutil
 CFLAGS+=       -DICL_KERNEL_PROXY
 MAN=           iscsid.8
 
-LIBADD=                iscsiutil md util
+LIBADD=                iscsiutil util
 
 .include <bsd.prog.mk>

Reply via email to