git: 4303bde4297a - main - zfs: fix build after openzfs/zfs@e63d026b9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 17 Nov 2025 16:12:39 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=4303bde4297a3d19cabdb08ce1550f682578d2ba
commit 4303bde4297a3d19cabdb08ce1550f682578d2ba
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2025-11-16 11:15:14 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2025-11-17 16:11:56 +0000
zfs: fix build after openzfs/zfs@e63d026b9
Fix Makefiles
Update zfs_config.h and zfs_gitrev.h
---
cddl/lib/drti/Makefile | 1 +
cddl/lib/libdtrace/Makefile | 1 +
cddl/lib/libicp/Makefile | 3 ---
cddl/lib/libspl/Makefile | 12 ++++++++++++
cddl/lib/libzpool/Makefile | 3 +--
cddl/usr.bin/zinject/Makefile | 2 +-
cddl/usr.bin/zstream/Makefile | 2 +-
cddl/usr.libexec/zpool_influxdb/Makefile | 2 +-
cddl/usr.sbin/dtrace/Makefile | 3 ++-
cddl/usr.sbin/lockstat/Makefile | 1 +
cddl/usr.sbin/plockstat/Makefile | 1 +
cddl/usr.sbin/zdb/Makefile | 2 +-
cddl/usr.sbin/zhack/Makefile | 2 +-
lib/libbe/tests/Makefile | 1 +
lib/libproc/Makefile | 1 +
lib/libprocstat/Makefile | 1 +
sbin/bectl/Makefile | 3 ++-
sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 3 +++
sys/cddl/dev/dtrace/x86/instr_size.c | 3 +++
sys/contrib/openzfs/lib/libspl/include/sys/condvar.h | 5 +++++
sys/contrib/openzfs/lib/libspl/include/sys/kmem.h | 10 ++++++++++
sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h | 2 ++
sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h | 4 ++++
sys/contrib/openzfs/lib/libspl/include/sys/tunables.h | 3 ++-
sys/modules/zfs/zfs_config.h | 4 ++--
sys/modules/zfs/zfs_gitrev.h | 2 +-
usr.sbin/fstyp/Makefile | 2 +-
27 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
index 4a7a8350cac8..50250887e379 100644
--- a/cddl/lib/drti/Makefile
+++ b/cddl/lib/drti/Makefile
@@ -11,6 +11,7 @@ CLEANFILES= ${FILES}
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
.undef LIBRARIES_ONLY
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index d086fffb07bc..dae6200d80c1 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -77,6 +77,7 @@ SYSINCS+= ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
WARNS?= 1
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
index 1a9a79103b50..833ecbb1c7f7 100644
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@ -91,9 +91,6 @@ KERNEL_C = \
core/kcf_prov_tabs.c \
$(ASM_SOURCES_C)
-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs
-KERNEL_C+= zfs_impl.c
-
SRCS= $(ASM_SOURCES_AS) $(KERNEL_C)
WARNS?= 2
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index 26e14ea72b8a..2c56348cdf9c 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -13,10 +13,22 @@ LIBADD=
SRCS = \
assert.c \
backtrace.c \
+ condvar.c \
+ cred.c \
+ kmem.c \
+ kstat.c \
+ libspl.c \
list.c \
mkdirp.c \
+ mutex.c \
os/freebsd/zone.c \
page.c \
+ procfs_list.c \
+ random.c \
+ rwlock.c \
+ sid.c \
+ taskq.c \
+ thread.c \
timestamp.c \
include/sys/list.h \
include/sys/list_impl.h
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 82ec0e890d56..031cc27fb431 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -36,7 +36,6 @@ LIB= zpool
USER_C = \
arc_os.c \
kernel.c \
- taskq.c \
util.c \
zfs_debug.c
@@ -181,6 +180,7 @@ KERNEL_C = \
zfs_debug_common.c \
zfs_fm.c \
zfs_fuid.c \
+ zfs_impl.c \
zfs_sa.c \
zfs_znode.c \
zfs_racct.c \
@@ -265,7 +265,6 @@ CFLAGS+= \
-I${ZFSTOP}/lib/libspl/include/os/freebsd \
-I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
-I${SRCTOP}/sys \
- -I${ZFSTOP}/include/os/freebsd/zfs \
-I${SRCTOP}/cddl/compat/opensolaris/include \
-I${ZFSTOP}/module/icp/include \
-I${SRCTOP}/compat/linuxkpi/common/include/linux \
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index 921d4df7a651..fd8437ed3f2c 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -23,6 +23,6 @@ CFLAGS+= \
-DHAVE_ISSETUGID \
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool
+LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool pthread
.include <bsd.prog.mk>
diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile
index b131901cb6a9..7b753f79c4d7 100644
--- a/cddl/usr.bin/zstream/Makefile
+++ b/cddl/usr.bin/zstream/Makefile
@@ -33,6 +33,6 @@ CFLAGS+= \
-DHAVE_ISSETUGID \
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool
+LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool pthread
.include <bsd.prog.mk>
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile
index 064ac9b23e4a..f91ce1a7a213 100644
--- a/cddl/usr.libexec/zpool_influxdb/Makefile
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile
@@ -22,6 +22,6 @@ CFLAGS+= \
-DSYSCONFDIR=\"/etc\" \
-DPKGDATADIR=\"/usr/share/zfs\"
-LIBADD= nvpair spl zfs
+LIBADD= nvpair spl zfs pthread
.include <bsd.prog.mk>
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index c72b55cc4903..cdfd8af8fe72 100644
--- a/cddl/usr.sbin/dtrace/Makefile
+++ b/cddl/usr.sbin/dtrace/Makefile
@@ -10,6 +10,7 @@ BINDIR?= /usr/sbin
WARNS?= 1
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
@@ -33,7 +34,7 @@ CFLAGS+= -fsanitize=address -fsanitize=undefined
LDFLAGS+= -fsanitize=address -fsanitize=undefined
.endif
-LIBADD= dtrace ctf elf proc spl xo
+LIBADD= dtrace ctf elf proc spl xo pthread
.if ${MK_DTRACE_TESTS} != "no"
SUBDIR+= tests
diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
index c87a37ef1504..498e2a5857e0 100644
--- a/cddl/usr.sbin/lockstat/Makefile
+++ b/cddl/usr.sbin/lockstat/Makefile
@@ -10,6 +10,7 @@ BINDIR?= /usr/sbin
WARNS?= 1
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile
index 3e35c5c5b8f7..2880c6aeafc7 100644
--- a/cddl/usr.sbin/plockstat/Makefile
+++ b/cddl/usr.sbin/plockstat/Makefile
@@ -10,6 +10,7 @@ BINDIR?= /usr/sbin
WARNS?= 1
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index 7d1e41e1690e..f8f7eea6050b 100644
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -23,7 +23,7 @@ CFLAGS+= \
-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
-DHAVE_ISSETUGID
-LIBADD= nvpair umem uutil zdb zfs_core zfs spl avl zutil zpool crypto
+LIBADD= nvpair umem uutil zdb zfs_core zfs spl avl zutil zpool crypto pthread
CFLAGS.gcc+= -fms-extensions
# Since there are many asserts in this program, it makes no sense to compile
diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
index 69d561b3407b..2b981919e17b 100644
--- a/cddl/usr.sbin/zhack/Makefile
+++ b/cddl/usr.sbin/zhack/Makefile
@@ -24,7 +24,7 @@ CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-LIBADD= nvpair zfs spl zutil zpool
+LIBADD= nvpair zfs spl zutil zpool pthread
CFLAGS+= -DDEBUG=1
#DEBUG_FLAGS+= -g
diff --git a/lib/libbe/tests/Makefile b/lib/libbe/tests/Makefile
index 20a4e1ddfeb7..80731ed1effc 100644
--- a/lib/libbe/tests/Makefile
+++ b/lib/libbe/tests/Makefile
@@ -10,6 +10,7 @@ LIBADD+= zfs \
spl \
nvpair \
be \
+ pthread
CFLAGS+= -I${SRCTOP}/lib/libbe
CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index 785007188255..5720dfdb6621 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -19,6 +19,7 @@ LIBADD+= cxxrt elf procstat rtld_db util z
LIBADD+= ctf
IGNORE_PRAGMA= YES
CFLAGS+= -DIN_BASE
+CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index e20518910ba3..ab0c8157b393 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -60,6 +60,7 @@ CFLAGS.zfs.c+= -DIN_BASE
CFLAGS.zfs.c+= -DHAVE_ISSETUGID
CFLAGS.zfs.c+= -DZFS_DEBUG
CFLAGS.zfs.c+= -I${ZFSTOP}/include
+CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libzpool/include
CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include
CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
CFLAGS.zfs.c+= -I${ZFSTOP}/include/os/freebsd/zfs
diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile
index c11426c57e45..cfd6ee2ccb97 100644
--- a/sbin/bectl/Makefile
+++ b/sbin/bectl/Makefile
@@ -11,7 +11,8 @@ LIBADD+= be \
nvpair \
spl \
util \
- zfsbootenv
+ zfsbootenv \
+ pthread
CFLAGS+= -DIN_BASE
CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
index c274a9f3357a..242a32e140f5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
@@ -70,6 +70,9 @@ typedef int processorid_t;
#include <sys/linker.h>
#include <sys/ioccom.h>
#include <sys/cred.h>
+#ifdef __FreeBSD__
+#include <sys/_mutex.h>
+#endif
#include <sys/proc.h>
#include <sys/types.h>
#include <sys/ucred.h>
diff --git a/sys/cddl/dev/dtrace/x86/instr_size.c b/sys/cddl/dev/dtrace/x86/instr_size.c
index 4397b3bd69d7..41faf0f3e5aa 100644
--- a/sys/cddl/dev/dtrace/x86/instr_size.c
+++ b/sys/cddl/dev/dtrace/x86/instr_size.c
@@ -29,6 +29,9 @@
#include <sys/types.h>
#include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/_mutex.h>
+#endif
#include <sys/proc.h>
#ifdef illumos
#include <sys/cmn_err.h>
diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h b/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h
index 9a05c41d1510..fb8f7c9bf6b1 100644
--- a/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h
+++ b/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h
@@ -29,6 +29,10 @@
#ifndef _SYS_CONDVAR_H
#define _SYS_CONDVAR_H
+#ifdef SKIP_SPL_SYS_CONDVAR_H
+#include_next <sys/condvar.h>
+#else
+
#include <pthread.h>
#include <sys/time.h>
#include <sys/mutex.h>
@@ -62,4 +66,5 @@ extern void cv_broadcast(kcondvar_t *cv);
#define cv_timedwait_idle_hires(cv, mp, t, r, f) \
cv_timedwait_hires(cv, mp, t, r, f)
+#endif /* SKIP_SPL_CONDVAR_H */
#endif /* _SYS_CONDVAR_H */
diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/kmem.h b/sys/contrib/openzfs/lib/libspl/include/sys/kmem.h
index 0321f6a0d5ba..33e618f46bb0 100644
--- a/sys/contrib/openzfs/lib/libspl/include/sys/kmem.h
+++ b/sys/contrib/openzfs/lib/libspl/include/sys/kmem.h
@@ -32,6 +32,10 @@
#include <umem.h>
#include <sys/types.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Kernel memory
*/
@@ -65,8 +69,10 @@ extern char *kmem_asprintf(const char *fmt, ...);
#define kmem_strfree(str) kmem_free((str), strlen(str) + 1)
#define kmem_strdup(s) strdup(s)
+#ifndef __cplusplus
extern int kmem_scnprintf(char *restrict str, size_t size,
const char *restrict fmt, ...);
+#endif
typedef umem_cache_t kmem_cache_t;
@@ -83,4 +89,8 @@ typedef int fstrans_cookie_t;
extern fstrans_cookie_t spl_fstrans_mark(void);
extern void spl_fstrans_unmark(fstrans_cookie_t);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _SYS_KMEM_H */
diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h b/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h
index 93b80a4bfdb6..144a8a22b9b5 100644
--- a/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h
+++ b/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h
@@ -45,6 +45,7 @@ typedef struct procfs_list {
size_t pl_node_offset;
} procfs_list_t;
+#ifndef __cplusplus
struct seq_file { };
void seq_printf(struct seq_file *m, const char *fmt, ...);
@@ -65,5 +66,6 @@ void procfs_list_install(const char *module,
void procfs_list_uninstall(procfs_list_t *procfs_list);
void procfs_list_destroy(procfs_list_t *procfs_list);
void procfs_list_add(procfs_list_t *procfs_list, void *p);
+#endif
#endif /* _SYS_PROCFS_LIST_H */
diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h b/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h
index e33915c8d96b..cc6edf25a7bc 100644
--- a/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h
+++ b/sys/contrib/openzfs/lib/libspl/include/sys/sysmacros.h
@@ -41,6 +41,10 @@
#include_next <sys/sysmacros.h>
#endif
+#ifdef __FreeBSD__
+#include <sys/param.h>
+#endif
+
/* common macros */
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h
index c85400f6fd28..d93425733709 100644
--- a/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h
+++ b/sys/contrib/openzfs/lib/libspl/include/sys/tunables.h
@@ -25,7 +25,8 @@
*/
#ifndef _SYS_TUNABLES_H
-#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden")))
+//#define _SYS_TUNABLES_H extern __attribute__((visibility("hidden")))
+#define _SYS_TUNABLES_H extern
typedef enum {
ZFS_TUNABLE_TYPE_INT,
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index 39b9229653af..f012910f58e7 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -856,7 +856,7 @@
/* #undef ZFS_DEVICE_MINOR */
/* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.4.99-129-FreeBSD_g0455150f1"
+#define ZFS_META_ALIAS "zfs-2.4.99-220-FreeBSD_ge63d026b9"
/* Define the project author. */
#define ZFS_META_AUTHOR "OpenZFS"
@@ -886,7 +886,7 @@
#define ZFS_META_NAME "zfs"
/* Define the project release. */
-#define ZFS_META_RELEASE "129-FreeBSD_g0455150f1"
+#define ZFS_META_RELEASE "220-FreeBSD_ge63d026b9"
/* Define the project version. */
#define ZFS_META_VERSION "2.4.99"
diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h
index 87d2071cb0d2..f632d7d06ebe 100644
--- a/sys/modules/zfs/zfs_gitrev.h
+++ b/sys/modules/zfs/zfs_gitrev.h
@@ -1 +1 @@
-#define ZFS_META_GITREV "zfs-2.4.99-129-g0455150f1"
+#define ZFS_META_GITREV "zfs-2.4.99-220-ge63d026b9"
diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
index ae5bae2e4f9d..c1f812cb5b97 100644
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -47,7 +47,7 @@ CFLAGS.${src}+=-I${SRCTOP}/sys
LIBADD= geom md ufs
.if ${MK_ZFS} != "no"
-LIBADD+=nvpair zfs spl
+LIBADD+=nvpair zfs spl pthread
.endif
.include <bsd.prog.mk>