From nobody Mon Dec 8 12:29:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dQ1WB2GF0z6Jjp4 for ; Mon, 08 Dec 2025 12:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQ1W96BnJz3TCm for ; Mon, 08 Dec 2025 12:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765196949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4jZgPa4vWsVYHaxc6TSyJYZSQopj0/jdUVTQTRKIx0=; b=WuSHOVZ4IboKGdK3KvieKeNN8X2mATJNiOtXmzREop+cCQBuynQeDPDYGBqdMlhu3d+fs1 LRV63xIJrVAQbJwBRuyjJ5l2niHq0iD9EqqH3pGS3JtGCETyna74WZl6vyBGPGVclRSjEO A388hygUoCXbKenneNkaP0EoeyGm1W8NX12XSi+vQHLYc0WWFbDekiIjhBdYgQ3mr6xvLR yKTZRbKHWBkzHcWu6g7knN5c5N/NvDpZi+U6Pa4g5aVV7FOVFDnhDhfqFTO9k4rrZViVsq LD3XunwCeh+R+vn5Og4zQT5t2S/Zu6rTmXQGF6IIMgPOU0dqUZPAIGkIC+d9NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765196949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4jZgPa4vWsVYHaxc6TSyJYZSQopj0/jdUVTQTRKIx0=; b=wSnhgVKU2v09/xPrc3C8JREDHpMieljJNCNov3oGmstqTX+v3rwO6uZxDiqqcEO6GGTPCS xXHAH+fd7rvfoGZfB/Eafgw7z+O5aeX5HhkVdN7GkWMBAD3nqwt5hl1MKdZWR3GXfLvsTh WsPc3ymk2Menkrch92l6JVdL8uTjrxC3j3yJSUG+iktFkL+6S2Pr5wVR2HSYRQ+0ZS1Iqg SmiMU8cmZxAW4lCL4TAueaIW4nVQRMntbkxKs4AIOADAeH75oiinIS7RCVK7gdk3i4G5SQ ZJZkSogSjCtnVewSDPeysJ4GOZcIqb5gTRw4JSrzs9RReBpexw4ZhNcVcx4knQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765196949; a=rsa-sha256; cv=none; b=CUdPplJeHzXis9mxaAwuxU0UkFBrUsjikzFfK+Sqb6s/EHjmb/J2+feRkBf9LVa6Ls0NOk ztrxiYJpz4mOalClAPLhKWYMjOlgE3O7VfnFFoe029Twt3FwPb3zFLdjmVb4LWGl5EmN7e eg7+tewsBPPuhL/zzuF9UmqrhDx/p9vT16XWvB9Ffck+lGJrcBZYo5raTxJpqfDieR5e7M qwPgXqaMrS17u+NT9DxyXKY6qhxlYFPghEbGosPkLMHzioaQkrAnztMdecsfTOjGGouo4f k+RyHCzfTX0qJVmhHpvNI607F1H/zb3AHUvCwNaxvLCmWLUIoutEIv8l1Yw0gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQ1W94kZpz1Q8p for ; Mon, 08 Dec 2025 12:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24e13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 12:29:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 2f6c77cd6f08 - main - zfs: unbreak build after 89f729dcc merge List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f6c77cd6f08b9bb646e038e3211b0ad21a2c012 Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 12:29:09 +0000 Message-Id: <6936c495.24e13.745784d0@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2f6c77cd6f08b9bb646e038e3211b0ad21a2c012 commit 2f6c77cd6f08b9bb646e038e3211b0ad21a2c012 Author: Martin Matuska AuthorDate: 2025-12-08 12:21:26 +0000 Commit: Martin Matuska 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 \