Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 08 Dec 2025 12:29:09 +0000
From:      Martin Matuska <mm@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2f6c77cd6f08 - main - zfs: unbreak build after 89f729dcc merge
Message-ID:  <6936c495.24e13.745784d0@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help

The branch main has been updated by mm:

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

commit 2f6c77cd6f08b9bb646e038e3211b0ad21a2c012
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2025-12-08 12:21:26 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2025-12-08 12:21:26 +0000

    zfs: unbreak build after 89f729dcc merge
    
    Link zfsd against spl and pthread
---
 cddl/usr.sbin/zfsd/Makefile.common | 2 +-
 cddl/usr.sbin/zfsd/Makefile.depend | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common
index 1bade90d140f..b8d5db0ee6e2 100644
--- a/cddl/usr.sbin/zfsd/Makefile.common
+++ b/cddl/usr.sbin/zfsd/Makefile.common
@@ -25,7 +25,7 @@ CFLAGS+= -I${SRCTOP}/cddl/usr.sbin
 CFLAGS+= -DHAVE_ISSETUGID
 CFLAGS+= -DHAVE_EXECVPE
 
-LIBADD+=	devdctl zfs util geom bsdxml sbuf nvpair avl zutil
+LIBADD+=	devdctl zfs util geom bsdxml sbuf nvpair avl zutil spl pthread
 
 cscope:
 	find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \
diff --git a/cddl/usr.sbin/zfsd/Makefile.depend b/cddl/usr.sbin/zfsd/Makefile.depend
index 64528ed3f4cb..9c040a0e10af 100644
--- a/cddl/usr.sbin/zfsd/Makefile.depend
+++ b/cddl/usr.sbin/zfsd/Makefile.depend
@@ -16,6 +16,7 @@ DIRDEPS = \
 	lib/libexpat \
 	lib/libgeom \
 	lib/libsbuf \
+	lib/libspl \
 	lib/libutil \
 	lib/msun \
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6936c495.24e13.745784d0>